Skip to content

Add regex support for optional dependencies #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NinFreakinJa wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add regex support for optional dependencies #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1df101
Add regex support for optional dependencies
NinFreakinJa May 3, 2026
c8cb1c4
Add extras tests
NinFreakinJa May 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ipydeps/ipydeps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
get_stdlib_packages,
)

package_name_pattern = re.compile(r'([A-Za-z][A-Za-z0-9_\-]+(((<|>|<=|>=|==|~=)[0-9]+\.[0-9]+(\.[0-9]+)*)((\.?(a|b|rc|post|dev)[0-9]+)|\+[A-Za-z0-9_\-\.]+)*)?)')
package_name_pattern = re.compile(r'([A-Za-z][A-Za-z0-9_\-]+(\[(([A-Za-z][A-Za-z0-9_\-]+,?)*[A-Za-z][A-Za-z0-9_\-]+)?\])?(((<|>|<=|>=|==|~=)[0-9]+\.[0-9]+(\.[0-9]+)*)((\.?(a|b|rc|post|dev)[0-9]+)|\+[A-Za-z0-9_\-\.]+)*)?)')
pip_run_args = [sys.executable, '-m', 'pip']

def run_pip(
Expand Down
7 changes: 7 additions & 0 deletions tests/test_ipydeps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@

def test_get_pkg_names():
assert len(get_pkg_names('abc DEF hIj')) == 3
assert len(get_pkg_names('abc[DEF] HIJ kLo[mnp,qrs]')) == 3

def test_pkg_name_list():
assert len(get_pkg_names('abc DEF hIj')) == 3
assert len(get_pkg_names(['abc', 'DEF', 'hIj'])) == 3
assert len(get_pkg_names(['abc[DEF]', 'HIJ', 'kLo[mnp,qrs]'])) == 3

def test_bad_pkg_name():
assert len(get_pkg_names(['exec', 'exec()'])) == 1
Expand Down Expand Up @@ -67,6 +69,11 @@ def test_version_specifier_special_release_with_seperator():
assert len(packages) == 1
assert 'bar==5.4.0.dev1' in packages

def test_version_specifier_with_extras():
packages = get_pkg_names('bar[extra]==5.4.0.dev1')
assert len(packages) == 1
assert 'bar[extra]==5.4.0.dev1' in packages

def test_version_specifier_plus_sign_release():
packages = get_pkg_names('bar~=2.0.43+2')
assert len(packages) == 1
Expand Down