Use SemVer for setup.py to pin versions and repair version parsing (#522

)
mangaki · Nov 20, 2017 · cac99fa · cac99fa
1 parent 4b79460
commit cac99fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/mangaki/mangaki/settings.py b/mangaki/mangaki/settings.py
@@ -11,7 +11,7 @@
 import json
 import os
 from setuptools_scm import get_version
-import pkg_resources
+from pkg_resources import get_distribution, DistributionNotFound
 from django.utils.translation import ugettext_lazy as _
 
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
@@ -40,8 +40,8 @@
 # Step 2: if we are a nice package.
 try:
     if not VERSION:
-        VERSION = pkg_resources.require('mangaki')[0].version
-except:
+        VERSION = get_distribution('mangaki').version
+except DistributionNotFound:
     VERSION = None
 
 # Otherwise, let the version be unknown.

diff --git a/mangaki/setup.py b/mangaki/setup.py
@@ -13,27 +13,26 @@
         'Django>=1.11,<2',
         'django-allauth>=0.28',
         'Markdown>=2.6,<3',
-        'django-bootstrap3>=8.2,<8.3',
+        'django-bootstrap3>=8.2,<9',
         'psycopg2>=2.7,<3',
         'numpy',
         'beautifulsoup4',
         'natsort',
         'django-analytical',
         'django-cookie-law',
         'django-js-reverse',
-        'djangorestframework',
         'scikit-learn>=0.18,<0.19',
         'scipy',
         'pandas',
-        'typing>=3.6,<3.7',
+        'typing>=3.6,<4',
         'tensorflow>=1.1.0,<1.2',
-        'raven>=6.1.0',
-        'djangorestframework>=3.6,<3.7',
-        'coreapi>=2.3,<2.4',
-        'celery>=4.0,<4.1',
-        'redis>=2.10,<2.11',
-        'Pillow>=4.1',
-        'setuptools_scm>=1.15'
+        'raven>=6.1.0,<7',
+        'djangorestframework>=3.6,<4',
+        'coreapi>=2.3,<3',
+        'celery>=4.0,<5',
+        'redis>=2.10,<3',
+        'Pillow>=4.1,<5',
+        'setuptools_scm>=1.15,<2'
     ],
     packages=find_packages(),
     include_package_data=True,