diff --git a/PKG-INFO b/PKG-INFO index 1c46a76..5686739 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,10 +1,10 @@ Metadata-Version: 1.0 Name: swh.model -Version: 0.0.16 +Version: 0.0.17 Summary: Software Heritage data model Home-page: https://forge.softwareheritage.org/diffusion/DMOD/ Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Description: UNKNOWN Platform: UNKNOWN diff --git a/debian/control b/debian/control index 3e7fc44..f85b0fa 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,18 @@ Source: swh-model Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-nose, python3-setuptools, - python3-pyblake2, + python3 (>= 3.5) | python3-pyblake2, python3-vcversioner Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/diffusion/DMOD/ Package: python3-swh.model Architecture: all Depends: ${misc:Depends}, ${python3:Depends} Description: Software Heritage data model diff --git a/requirements-swh.txt b/requirements-swh.txt index fbe63bd..e69de29 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1 +0,0 @@ -pyblake2 diff --git a/setup.py b/setup.py index a520dc0..793b8e7 100644 --- a/setup.py +++ b/setup.py @@ -1,31 +1,37 @@ +import sys + from setuptools import setup def parse_requirements(): requirements = [] for reqf in ('requirements.txt', 'requirements-swh.txt'): with open(reqf) as f: for line in f.readlines(): line = line.strip() if not line or line.startswith('#'): continue requirements.append(line) return requirements +extra_requirements = [] +if sys.version_info < (3, 5): + extra_requirements = ['pyblake2'] + setup( name='swh.model', description='Software Heritage data model', author='Software Heritage developers', author_email='swh-devel@inria.fr', url='https://forge.softwareheritage.org/diffusion/DMOD/', packages=[ 'swh.model', 'swh.model.fields', 'swh.model.tests', 'swh.model.tests.fields', ], # packages's modules scripts=[], # scripts to package - install_requires=parse_requirements(), + install_requires=parse_requirements() + extra_requirements, setup_requires=['vcversioner'], vcversioner={}, include_package_data=True, ) diff --git a/swh.model.egg-info/PKG-INFO b/swh.model.egg-info/PKG-INFO index 1c46a76..5686739 100644 --- a/swh.model.egg-info/PKG-INFO +++ b/swh.model.egg-info/PKG-INFO @@ -1,10 +1,10 @@ Metadata-Version: 1.0 Name: swh.model -Version: 0.0.16 +Version: 0.0.17 Summary: Software Heritage data model Home-page: https://forge.softwareheritage.org/diffusion/DMOD/ Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Description: UNKNOWN Platform: UNKNOWN diff --git a/swh.model.egg-info/requires.txt b/swh.model.egg-info/requires.txt index 77d4685..39a323a 100644 --- a/swh.model.egg-info/requires.txt +++ b/swh.model.egg-info/requires.txt @@ -1,2 +1 @@ -pyblake2 vcversioner diff --git a/version.txt b/version.txt index bbf69d8..155f917 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v0.0.16-0-g6f89adf \ No newline at end of file +v0.0.17-0-g11de644 \ No newline at end of file