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

Versioning with latest python libs #1015

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Versioning with latest python libs #1015

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
87ba95d
setuptools 40.6.3 does not have vtags
pjotrp Dec 14, 2018
db57865
python-prov 1.5.3 appears to work
pjotrp Dec 14, 2018
4192538
python-prov 1.5.3 appears to work
pjotrp Dec 14, 2018
edeb82b
Fix prov requirements version
mb1069 Dec 14, 2018
a49844e
*Amend to previous fix
mb1069 Dec 14, 2018
e12d36b
Update setup.py
mb1069 Dec 14, 2018
e973ad3
Merge branch 'master' into master
mr-c Dec 14, 2018
e0e3392
Disable typing extensions: no longer required with Python 3.7
pjotrp Dec 26, 2018
1a2085e
Merge branch 'master' of github.com:genenetwork/cwltool
pjotrp Dec 26, 2018
15539fb
%s/typing_extensions/typing/g
pjotrp Dec 26, 2018
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
10 changes: 6 additions & 4 deletions gittaggers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
SETUPTOOLS_VER = pkg_resources.get_distribution(
"setuptools").version.split('.')

RECENT_SETUPTOOLS = int(SETUPTOOLS_VER[0]) > 40 or (
int(SETUPTOOLS_VER[0]) == 40 and int(SETUPTOOLS_VER[1]) > 0) or (
int(SETUPTOOLS_VER[0]) == 40 and int(SETUPTOOLS_VER[1]) == 0 and
int(SETUPTOOLS_VER[2]) > 0)
[major,minor,sub] = [ int(item) for item in SETUPTOOLS_VER ]

RECENT_SETUPTOOLS = major > 40 or (major == 40 and minor or (major == 40 and minor==0 and sub > 0))
# 40.6.3 does not have vtags
if major == 40 and minor == 6 and sub == 3:
RECENT_SETUPTOOLS=False

class EggInfoFromGit(egg_info):
"""Tag the build with git commit timestamp.
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ shellescape>=3.4.1,<3.5
schema-salad>=3.0,<3.1
typing>=3.5.3; python_version<"3.6"
pathlib2==2.3.2; python_version<"3"
prov==1.5.1
prov==1.5.1,>=1.5.3
bagit==1.6.4
mypy-extensions
psutil
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
'six >= 1.9.0', # >= 1.9.0 required by prov
'psutil',
'scandir',
'prov == 1.5.1',
'prov == 1.5.1, >= 1.5.2',
'bagit >= 1.6.4',
'typing-extensions',
],
Expand Down Expand Up @@ -109,6 +109,6 @@
'Topic :: Scientific/Engineering :: Information Analysis',
'Topic :: Scientific/Engineering :: Medical Science Apps.',
'Topic :: System :: Distributed Computing',
'Topic :: Utilities',
'Topic :: Utilities'
]
)