Skip to content

Commit a79862c

Browse files
committed
Merge pull request #1679 from jenshnielsen/useenvmarker
use env markers for version specific deps
1 parent 91b19ee commit a79862c

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

qcodes/utils/installation_info.py

+4
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ def get_qcodes_requirements_versions() -> Dict[str, str]:
8080
req_modules = []
8181

8282
for req_name in req_names:
83+
# the requirement might have a pep 496
84+
# env marker. Filter that out before
85+
# checking the version
86+
req_name = req_name.split(';')[0]
8387
if req_name in _VERSIONLESS_PACKAGES:
8488
pass
8589
elif req_name in _IMPORT_NAMES:

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def readme():
3131
'tabulate',
3232
'tqdm',
3333
'applicationinsights',
34-
'dataclasses' # can be removed once we drop support for python 3.6
34+
"dataclasses;python_version<'3.7'" # can be removed once we drop support for python 3.6
3535
]
3636

3737
setup(name='qcodes',

0 commit comments

Comments
 (0)