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

use env markers for version specific deps #1679

Merged
merged 2 commits into from
Aug 20, 2019
Merged

use env markers for version specific deps #1679

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
ee31992
use env markers for version specific deps
jenshnielsen Aug 20, 2019
1ac8d73
Correct parsing of packages with env markers
jenshnielsen Aug 20, 2019
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
4 changes: 4 additions & 0 deletions qcodes/utils/installation_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ def get_qcodes_requirements_versions() -> Dict[str, str]:
req_modules = []

for req_name in req_names:
# the requirement might have a pep 496
# env marker. Filter that out before
# checking the version
req_name = req_name.split(';')[0]
if req_name in _VERSIONLESS_PACKAGES:
pass
elif req_name in _IMPORT_NAMES:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def readme():
'tabulate',
'tqdm',
'applicationinsights',
'dataclasses' # can be removed once we drop support for python 3.6
"dataclasses;python_version<'3.7'" # can be removed once we drop support for python 3.6
]

setup(name='qcodes',
Expand Down