Skip to content
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

Consider specifiers for equality operator to pin a dependency in make_install_requirement #1323

Merged
merged 11 commits into from
Feb 25, 2021
Merged

Consider specifiers for equality operator to pin a dependency in make_install_requirement #1323

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7ebcb50
Consider specifiers for equality operator to pin a dependency in
IceTDrinker Feb 13, 2021
37c84a7
Apply tox -e checkqa
IceTDrinker Feb 13, 2021
6a3b232
Prefer forcing version to string rather than building a Version objec…
IceTDrinker Feb 13, 2021
12dace5
Rename variables to have clearer names
IceTDrinker Feb 14, 2021
eface67
Write test for requirements pinned with === and multiple pin sources
IceTDrinker Feb 14, 2021
37029fd
Use fake test packages which demonstrates the torch use-case
IceTDrinker Feb 14, 2021
2711940
Network is not required by the test anymore, remove it
IceTDrinker Feb 14, 2021
04154d2
Pin test_package_2 with == operator
IceTDrinker Feb 15, 2021
f77201c
Add test cases to check different combinations of pins
IceTDrinker Feb 15, 2021
dfb28ac
Parametrize test, use simple versions
IceTDrinker Feb 19, 2021
8338272
Add test ids
IceTDrinker Feb 24, 2021
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
Prev Previous commit
Next Next commit
Prefer forcing version to string rather than building a Version objec… 
…t from

a specifier version as it made tests fail
  • Loading branch information
@IceTDrinker
IceTDrinker committed Feb 24, 2021
commit 6a3b232ee34bd251456261ed6f8e1af3b29a1fc0
5 changes: 2 additions & 3 deletions piptools/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def comment(text: str) -> str:


def make_install_requirement(
name: str, version: Version, ireq: InstallRequirement
name: str, version: Union[str, Version], ireq: InstallRequirement
) -> InstallRequirement:
# If no extras are specified, the extras string is blank
extras_string = ""
Expand All @@ -78,8 +78,7 @@ def make_install_requirement(

version_specifier = "=="
for specifier in ireq.specifier:
specifier_version = Version(specifier.version)
if specifier.operator == "===" and specifier_version == version:
if specifier.operator == "===" and specifier.version == str(version):
version_specifier = "==="
break

Expand Down