Merge pull request #84 from pydicom/fix/pydicom-version

updating dockerfile and setup.py to set pydicom verison to 1.1.0

Dockerfile

@@ -2,7 +2,7 @@ FROM continuumio/miniconda3
 
 RUN apt-get update && apt-get install -y wget git pkg-config libfreetype6-dev
 RUN /opt/conda/bin/conda install matplotlib==2.1.2
-RUN pip install pydicom
+RUN pip install pydicom==1.1.0
 RUN mkdir /code
 ADD . /code
 WORKDIR /code

deid/version.py

@@ -22,7 +22,7 @@
 
 '''
 
-__version__ = "0.1.23"
+__version__ = "0.1.24"
 AUTHOR = 'Vanessa Sochat'
 AUTHOR_EMAIL = '[email protected]'
 NAME = 'deid'
@@ -39,10 +39,9 @@
     ('simplejson', {'min_version': '3.10.0'}),
     ('six', {'min_version': '1.10'}),
     ('pygments', {'min_version': '2.1.3'}),
+    ('pydicom', {'exact_version': '1.1.0' }),
     ('python-dateutil',{'min_version': None }),
     ('urllib3',{'exact_version': "1.21.1" }),
     ('validator.py',{'min_version': None })
 
 )
-
-DEPENDENCY_LINKS = ['https://github.com/pydicom/pydicom/tarball/master']

setup.py

@@ -66,7 +66,6 @@ def get_requirements(lookup=None):
 PACKAGE_URL = lookup['PACKAGE_URL']
 KEYWORDS = lookup['KEYWORDS']
 DESCRIPTION = lookup['DESCRIPTION']
-DEPENDENCY_LINKS = lookup['DEPENDENCY_LINKS']
 LICENSE = lookup['LICENSE']
 with open('README.md') as filey:
     LONG_DESCRIPTION = filey.read()
@@ -91,7 +90,6 @@ def get_requirements(lookup=None):
     long_description=LONG_DESCRIPTION,
     keywords=KEYWORDS,
     install_requires=INSTALL_REQUIRES,
-    dependency_links = DEPENDENCY_LINKS,
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',