Update all dependencies to current versions and bump to 2.3.5

DataONEorg · Aug 8, 2017 · 82da85c · 82da85c
1 parent 5dfbda2
commit 82da85c
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 40 deletions.
diff --git a/README.md b/README.md
@@ -116,6 +116,11 @@ Typically, it is not desirable to track generated files in Git. However, althoug
 
 Also implemented is a simple process for cleaning out unused sample files. Sample files are often orphaned when their corresponding tests are removed or refactored. The default storage location for sample files is a directory called `test_docs`. To clean out unused files, move all the files from `test_docs` to `test_docs_tidy`, and run the tests. Any files that are accessed by the tests will automatically be moved back to `test_docs`, and any files remaining in `test_docs_tidy` after a complete test run can be untracked and deleted.
 
+When staging `test_docs`, stage the directory, so that new files are included, and deleted files get deleted on the server:
+
+    $ git add test_utilities/src/d1_test/test_docs
+    $ git commit -m 'Update sample docs'
+
 #### DataONE Client to Django test adapter
 
 GMN tests are based on an adapter that enables using d1_client with the Django test framework. The adapter mocks Requests to issue requests through the Django test client.

diff --git a/client_cli/src/setup.py b/client_cli/src/setup.py
@@ -28,7 +28,7 @@
 def main():
   setuptools.setup(
     name='dataone.cli',
-    version='2.3.4',
+    version='2.3.5',
     description='Command-Line Interface (CLI) for DataONE',
     author='DataONE Project',
     author_email='developers@dataone.org',
@@ -37,10 +37,10 @@ def main():
     packages=setuptools.find_packages(),
     include_package_data=True,
     install_requires=[
-      'dataone.common == 2.3.4',
-      'dataone.libclient == 2.3.4',
+      'dataone.common == 2.3.5',
+      'dataone.libclient == 2.3.5',
       #
-      'requests == 2.18.1',
+      'requests == 2.18.3',
     ],
     entry_points={'console_scripts': [
       'dataone = d1_cli.dataone:main',

diff --git a/client_onedrive/src/setup.py b/client_onedrive/src/setup.py
@@ -32,7 +32,7 @@
 def main():
   setuptools.setup(
     name='dataone.onedrive',
-    version='2.3.4',
+    version='2.3.5',
     description='Filesystem access to the DataONE Workspace',
     author='DataONE Project',
     author_email='developers@dataone.org',
@@ -41,14 +41,14 @@ def main():
     packages=setuptools.find_packages(),
     include_package_data=True,
     install_requires=[
-      'dataone.common == 2.3.4',
-      'dataone.libclient == 2.3.4',
+      'dataone.common == 2.3.5',
+      'dataone.libclient == 2.3.5',
       #
       'fusepy == 2.0.4',
       'pyxb == 1.2.5',
       'pyzotero == 1.2.13',
       'rdflib == 4.2.2',
-      'requests == 2.18.1',
+      'requests == 2.18.3',
     ],
     setup_requires=[
       'setuptools_git >= 1.1',

diff --git a/dev_tools/src/d1_dev/setup-all.py b/dev_tools/src/d1_dev/setup-all.py
@@ -77,10 +77,8 @@ def main():
 
 def run_setup(setup_dir_path, command_list):
   try:
-    subprocess.check_call(
-      ['python', 'setup.py'] + command_list,
-      cwd=setup_dir_path,
-    )
+    subprocess.check_call(['python', 'setup.py'] + command_list,
+                          cwd=setup_dir_path)
   except subprocess.CalledProcessError as e:
     logging.error('Setup failed. error="{}"'.format(str(e)))
     raise

diff --git a/dev_tools/src/setup.py b/dev_tools/src/setup.py
@@ -29,7 +29,7 @@
 def main():
   setuptools.setup(
     name='dataone.dev',
-    version='2.3.4',
+    version='2.3.5',
     description='DataONE developer tools',
     author='DataONE Project',
     author_email='developers@dataone.org',
@@ -46,6 +46,12 @@ def main():
       #'dataone.common == 2.3.0rc1',
       #'dataone.libclient == 2.3.0rc1',
       #
+      # This is a hack to force a version of idna that is compatible with both
+      # asn1crypto and requests. Without this, if asn1crypto is installed first,
+      # it will install idna 2.6, and requests will fails due to the fact that
+      # Python doesn't have a real package manager.
+      'idna == 2.5',
+      #
       'baron == 0.6.6',
       'pip == 9.0.1',
       'redbaron == 0.6.3',

diff --git a/gmn/src/d1_gmn/version.py b/gmn/src/d1_gmn/version.py
@@ -1 +1 @@
-__version__ = '2.3.4'
+__version__ = '2.3.5'
diff --git a/gmn/src/setup.py b/gmn/src/setup.py
@@ -31,7 +31,7 @@ def main():
   # noinspection PyUnresolvedReferences
   setuptools.setup(
     name='dataone.gmn',
-    version='2.3.4',
+    version='2.3.5',
     description='DataONE Generic Member Node (GMN)',
     author='DataONE Project',
     author_email='developers@dataone.org',
@@ -43,16 +43,16 @@ def main():
       '': ['settings.py'],
     },
     install_requires=[
-      'dataone.cli == 2.3.4',
-      'dataone.common == 2.3.4',
-      'dataone.libclient == 2.3.4',
+      'dataone.cli == 2.3.5',
+      'dataone.common == 2.3.5',
+      'dataone.libclient == 2.3.5',
       #
-      'django == 1.11.2',
-      'iso8601 == 0.1.11',
-      'psycopg2 == 2.7.1',
+      'django == 1.11.4',
+      'iso8601 == 0.1.12',
+      'psycopg2 == 2.7.3',
       'PyJWT == 1.5.2',
       'pyxb == 1.2.5',
-      'requests == 2.18.1',
+      'requests == 2.18.3',
     ],
     setup_requires=[
       'setuptools_git >= 1.1',

diff --git a/lib_client/src/setup.py b/lib_client/src/setup.py
@@ -28,7 +28,7 @@
 def main():
   setuptools.setup(
     name='dataone.libclient',
-    version='2.3.4',
+    version='2.3.5',
     description='A DataONE client library for Python',
     author='DataONE Project',
     author_email='developers@dataone.org',
@@ -37,12 +37,12 @@ def main():
     packages=setuptools.find_packages(),
     include_package_data=True,
     install_requires=[
-      'dataone.common == 2.3.4',
+      'dataone.common == 2.3.5',
       #
       'cachecontrol == 0.12.3',
       'pyxb == 1.2.5',
       'requests-toolbelt == 0.8.0',
-      'requests[security] == 2.18.1',
+      'requests[security] == 2.18.3',
     ],
     setup_requires=[
       'setuptools_git >= 1.1',

diff --git a/lib_common/src/d1_common/const.py b/lib_common/src/d1_common/const.py
@@ -37,7 +37,7 @@
 )
 
 # Version of the DataONE Python stack
-VERSION = '2.3.4'
+VERSION = '2.3.5'
 
 # Maximum number of entries per list objects request
 MAX_LISTOBJECTS = 1000

diff --git a/lib_common/src/setup.py b/lib_common/src/setup.py
@@ -28,7 +28,7 @@
 def main():
   setuptools.setup(
     name='dataone.common',
-    version='2.3.4',
+    version='2.3.5',
     description=(
       'Contains functionality common to projects that interact with '
       'the DataONE infrastructure via Python'
@@ -41,10 +41,10 @@ def main():
     include_package_data=True,
     install_requires=[
       'contextlib2 == 0.5.5',
-      'cryptography == 1.9',
-      'iso8601 == 0.1.11',
+      'cryptography == 2.0.3',
+      'iso8601 == 0.1.12',
       'PyJWT == 1.5.2',
-      'pyasn1 == 0.2.3',
+      'pyasn1 == 0.3.2',
       'pyxb == 1.2.5',
       'rdflib == 4.2.2',
     ],

diff --git a/test_utilities/src/setup.py b/test_utilities/src/setup.py
@@ -28,7 +28,7 @@
 def main():
   setuptools.setup(
     name='dataone.test_utilities',
-    version='2.3.4',
+    version='2.3.5',
     description='Utilities for testing DataONE infrastructure components',
     author='DataONE Project',
     author_email='developers@dataone.org',
@@ -37,18 +37,18 @@ def main():
     packages=setuptools.find_packages(),
     include_package_data=True,
     install_requires=[
-      'dataone.libclient == 2.3.4',
+      'dataone.libclient == 2.3.5',
       #
       'contextlib2 == 0.5.5',
-      'decorator == 4.0.11',
+      'decorator == 4.1.2',
       'freezegun == 0.3.9',
       'mock == 2.0.0',
       'multi-mechanize == 1.2.0',
-      'pyasn1 == 0.2.3',
+      'pyasn1 == 0.3.2',
       'pyxb == 1.2.5',
       'rdflib == 4.2.2',
-      'requests == 2.18.1',
-      'responses == 0.5.1',
+      'requests == 2.18.3',
+      'responses == 0.6.1',
     ],
     setup_requires=[
       'setuptools_git >= 1.1',

diff --git a/tools/src/setup.py b/tools/src/setup.py
@@ -29,7 +29,7 @@
 def main():
   setuptools.setup(
     name='dataone.tools',
-    version='2.3.4',
+    version='2.3.5',
     description='DataONE tools and examples',
     author='DataONE Project',
     author_email='developers@dataone.org',
@@ -42,9 +42,9 @@ def main():
     },
     install_requires=[
       # These are not yet available when bootstrapping on Travis
-      'dataone.cli == 2.3.4',
-      'dataone.common == 2.3.4',
-      'dataone.libclient == 2.3.4',
+      'dataone.cli == 2.3.5',
+      'dataone.common == 2.3.5',
+      'dataone.libclient == 2.3.5',
     ],
     setup_requires=[
       'setuptools_git >= 1.1',