From 21e16dac3387d08ef05bb8e847b93b3eb48953fe Mon Sep 17 00:00:00 2001 From: Roger Dahl Date: Thu, 15 Feb 2018 08:55:23 -0700 Subject: [PATCH] Update dependencies to current as of 2018-02-15 --- README.md | 4 ---- client_cli/src/setup.py | 6 +++--- client_onedrive/src/setup.py | 8 ++++---- dev_tools/src/d1_dev/pip-update-all.py | 13 +++++++++++-- dev_tools/src/setup.py | 2 +- gmn/src/d1_gmn/version.py | 2 +- gmn/src/setup.py | 12 ++++++------ lib_client/src/setup.py | 6 +++--- lib_common/src/d1_common/const.py | 2 +- lib_common/src/setup.py | 2 +- lib_scimeta/src/setup.py | 2 +- .../replication_tester/replication_tester.py | 12 +++++------- .../test_docs/test_templates_home_html_doc.sample | 2 +- test_utilities/src/setup.py | 14 +++++++------- tools/src/setup.py | 8 ++++---- 15 files changed, 49 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index 493ae73f6..efbb68f2c 100644 --- a/README.md +++ b/README.md @@ -245,10 +245,6 @@ Check that there are no package version conflicts: $ pip check -Some sample files contain the version tag and must be updated when the version changes. - - $ pytest -xvs --sample-ask - Commit and push the changes, and check the build on Travis. #### Building the release packages diff --git a/client_cli/src/setup.py b/client_cli/src/setup.py index a963466a2..dcc1fd155 100644 --- 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.4.1', + version='2.4.2', description='Command-Line Interface (CLI) for DataONE', author='DataONE Project', author_email='developers@dataone.org', @@ -37,8 +37,8 @@ def main(): packages=setuptools.find_packages(), include_package_data=True, install_requires=[ - 'dataone.common == 2.4.1', - 'dataone.libclient == 2.4.1', + 'dataone.common == 2.4.2', + 'dataone.libclient == 2.4.2', # 'requests == 2.18.4', ], diff --git a/client_onedrive/src/setup.py b/client_onedrive/src/setup.py index e6b7608a7..54c412d6d 100755 --- 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.4.1', + version='2.4.2', description='Filesystem access to the DataONE Workspace', author='DataONE Project', author_email='developers@dataone.org', @@ -41,12 +41,12 @@ def main(): packages=setuptools.find_packages(), include_package_data=True, install_requires=[ - 'dataone.common == 2.4.1', - 'dataone.libclient == 2.4.1', + 'dataone.common == 2.4.2', + 'dataone.libclient == 2.4.2', # 'fusepy == 2.0.4', 'pyxb == 1.2.6', - 'pyzotero == 1.3.0', + 'pyzotero == 1.3.1', 'rdflib == 4.2.2', 'requests == 2.18.4', ], diff --git a/dev_tools/src/d1_dev/pip-update-all.py b/dev_tools/src/d1_dev/pip-update-all.py index 03ae9f30b..1d61e754f 100755 --- a/dev_tools/src/d1_dev/pip-update-all.py +++ b/dev_tools/src/d1_dev/pip-update-all.py @@ -32,7 +32,11 @@ import subprocess import sys -NO_UPGRADE_LIST = ['Django'] +NO_UPGRADE_LIST = [ + 'Django', # We're on the last version that supports Python 2. + 'pygobject', # build error + 'zope.interface', # build error +] def main(): @@ -44,7 +48,12 @@ def main(): freeze_str = subprocess.check_output(['pip', 'freeze']) for line_str in freeze_str.splitlines(): - pkg_str, ver_str = line_str.strip().split('==') + print '#### {}'.format(line_str) + try: + pkg_str, ver_str = line_str.strip().split('==') + except ValueError: + print 'Skipped' + continue if pkg_str in NO_UPGRADE_LIST: logging.warn( 'Skipped package in NO_UPGRADE_LIST. pkg_str="{}"'.format(pkg_str) diff --git a/dev_tools/src/setup.py b/dev_tools/src/setup.py index b13ba90fc..42e211334 100644 --- 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.4.1', + version='2.4.2', description='DataONE developer tools', author='DataONE Project', author_email='developers@dataone.org', diff --git a/gmn/src/d1_gmn/version.py b/gmn/src/d1_gmn/version.py index 5cd7abf83..cb9dc8a91 100644 --- a/gmn/src/d1_gmn/version.py +++ b/gmn/src/d1_gmn/version.py @@ -1 +1 @@ -__version__ = '2.4.1' +__version__ = '2.4.2' diff --git a/gmn/src/setup.py b/gmn/src/setup.py index f5e37eeb5..13e26c725 100755 --- 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.4.1', + version='2.4.2', description='DataONE Generic Member Node (GMN)', author='DataONE Project', author_email='developers@dataone.org', @@ -43,14 +43,14 @@ def main(): '': ['settings.py'], }, install_requires=[ - 'dataone.cli == 2.4.1', - 'dataone.common == 2.4.1', - 'dataone.libclient == 2.4.1', - 'dataone.scimeta == 2.4.1', + 'dataone.cli == 2.4.2', + 'dataone.common == 2.4.2', + 'dataone.libclient == 2.4.2', + 'dataone.scimeta == 2.4.2', # 'django == 1.11.7', 'iso8601 == 0.1.12', - 'psycopg2 == 2.7.3.2', + 'psycopg2 == 2.7.4', 'PyJWT == 1.5.3', 'pyxb == 1.2.6', 'requests == 2.18.4', diff --git a/lib_client/src/setup.py b/lib_client/src/setup.py index d81ce71ef..6f1821cda 100644 --- 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.4.1', + version='2.4.2', description='A DataONE client library for Python', author='DataONE Project', author_email='developers@dataone.org', @@ -37,9 +37,9 @@ def main(): packages=setuptools.find_packages(), include_package_data=True, install_requires=[ - 'dataone.common == 2.4.1', + 'dataone.common == 2.4.2', # - 'cachecontrol == 0.12.3', + 'cachecontrol == 0.12.4', 'pyxb == 1.2.6', 'requests-toolbelt == 0.8.0', 'requests[security] == 2.18.4', diff --git a/lib_common/src/d1_common/const.py b/lib_common/src/d1_common/const.py index f4f0d11b0..5d77d36be 100644 --- 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.4.1' +VERSION = '2.4.2' # 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 index 297c79574..d215e4952 100644 --- 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.4.1', + version='2.4.2', description=( 'Contains functionality common to projects that interact with ' 'the DataONE infrastructure via Python' diff --git a/lib_scimeta/src/setup.py b/lib_scimeta/src/setup.py index 900c0a4f5..c2bc6ab39 100644 --- a/lib_scimeta/src/setup.py +++ b/lib_scimeta/src/setup.py @@ -28,7 +28,7 @@ def main(): setuptools.setup( name='dataone.scimeta', - version='2.4.1', + version='2.4.2', description='Utilities for processing Science Metadata', author='DataONE Project', author_email='developers@dataone.org', diff --git a/test_utilities/src/d1_test/replication_tester/replication_tester.py b/test_utilities/src/d1_test/replication_tester/replication_tester.py index 91bd9b5dd..94bbfbef3 100755 --- a/test_utilities/src/d1_test/replication_tester/replication_tester.py +++ b/test_utilities/src/d1_test/replication_tester/replication_tester.py @@ -40,8 +40,6 @@ import sys import time -import requests - import d1_common.const import d1_common.types.exceptions import d1_common.url @@ -189,11 +187,11 @@ def main(): while True: time.sleep(.1) else: - assert requests.get( - d1_common.url.joinPathElements( - options.src_base_url, 'diag', 'clear_replication_queue' - ) - ).ok + # assert requests.get( + # d1_common.url.joinPathElements( + # options.src_base_url, 'diag', 'clear_replication_queue' + # ) + # ).ok # An existing PID that returns approved on isNodeAuthorized() create_test_object_on_mn(options.src_base_url, src_existing_pid_approve) # An existing PID that returns denied on isNodeAuthorized() diff --git a/test_utilities/src/d1_test/test_docs/test_templates_home_html_doc.sample b/test_utilities/src/d1_test/test_docs/test_templates_home_html_doc.sample index 50a5700ff..992ac1e53 100644 --- a/test_utilities/src/d1_test/test_docs/test_templates_home_html_doc.sample +++ b/test_utilities/src/d1_test/test_docs/test_templates_home_html_doc.sample @@ -67,7 +67,7 @@ GMN version: - 2.4.1 + 2.4.2 Django version: diff --git a/test_utilities/src/setup.py b/test_utilities/src/setup.py index 96c851a15..134afb500 100644 --- 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.4.1', + version='2.4.2', description='Utilities for testing DataONE infrastructure components', author='DataONE Project', author_email='developers@dataone.org', @@ -37,23 +37,23 @@ def main(): packages=setuptools.find_packages(), include_package_data=True, install_requires=[ - 'dataone.libclient == 2.4.1', + 'dataone.libclient == 2.4.2', # 'contextlib2 == 0.5.5', - 'coverage == 4.4.2', + 'coverage == 4.5.1', 'coveralls == 1.2.0', - 'decorator == 4.1.2', + 'decorator == 4.2.1', 'freezegun == 0.3.9', 'mock == 2.0.0', 'multi-mechanize == 1.2.0', - 'posix-ipc == 1.0.0', + 'posix-ipc == 1.0.4', 'psutil == 5.4.3', 'pyasn1 == 0.4.2', - 'pytest == 3.3.1', + 'pytest == 3.4.0', 'pytest-cov == 2.5.1', 'pytest-django == 3.1.2', 'pytest-forked == 0.2', - 'pytest-xdist == 1.20.1', + 'pytest-xdist == 1.22.0', 'pyxb == 1.2.6', 'rdflib == 4.2.2', 'requests == 2.18.4', diff --git a/tools/src/setup.py b/tools/src/setup.py index 73d887d01..656b798bf 100644 --- a/tools/src/setup.py +++ b/tools/src/setup.py @@ -29,7 +29,7 @@ def main(): setuptools.setup( name='dataone.tools', - version='2.4.1', + version='2.4.2', 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.4.1', - 'dataone.common == 2.4.1', - 'dataone.libclient == 2.4.1', + 'dataone.cli == 2.4.2', + 'dataone.common == 2.4.2', + 'dataone.libclient == 2.4.2', ], setup_requires=[ 'setuptools_git >= 1.1',