Skip to content

Commit 82da85c

Browse files
committed
Update all dependencies to current versions and bump to 2.3.5
1 parent 5dfbda2 commit 82da85c

File tree

12 files changed

+49
-40
lines changed

12 files changed

+49
-40
lines changed

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ Typically, it is not desirable to track generated files in Git. However, althoug
116116

117117
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.
118118

119+
When staging `test_docs`, stage the directory, so that new files are included, and deleted files get deleted on the server:
120+
121+
$ git add test_utilities/src/d1_test/test_docs
122+
$ git commit -m 'Update sample docs'
123+
119124
#### DataONE Client to Django test adapter
120125

121126
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.

client_cli/src/setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
def main():
2929
setuptools.setup(
3030
name='dataone.cli',
31-
version='2.3.4',
31+
version='2.3.5',
3232
description='Command-Line Interface (CLI) for DataONE',
3333
author='DataONE Project',
3434
author_email='[email protected]',
@@ -37,10 +37,10 @@ def main():
3737
packages=setuptools.find_packages(),
3838
include_package_data=True,
3939
install_requires=[
40-
'dataone.common == 2.3.4',
41-
'dataone.libclient == 2.3.4',
40+
'dataone.common == 2.3.5',
41+
'dataone.libclient == 2.3.5',
4242
#
43-
'requests == 2.18.1',
43+
'requests == 2.18.3',
4444
],
4545
entry_points={'console_scripts': [
4646
'dataone = d1_cli.dataone:main',

client_onedrive/src/setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
def main():
3333
setuptools.setup(
3434
name='dataone.onedrive',
35-
version='2.3.4',
35+
version='2.3.5',
3636
description='Filesystem access to the DataONE Workspace',
3737
author='DataONE Project',
3838
author_email='[email protected]',
@@ -41,14 +41,14 @@ def main():
4141
packages=setuptools.find_packages(),
4242
include_package_data=True,
4343
install_requires=[
44-
'dataone.common == 2.3.4',
45-
'dataone.libclient == 2.3.4',
44+
'dataone.common == 2.3.5',
45+
'dataone.libclient == 2.3.5',
4646
#
4747
'fusepy == 2.0.4',
4848
'pyxb == 1.2.5',
4949
'pyzotero == 1.2.13',
5050
'rdflib == 4.2.2',
51-
'requests == 2.18.1',
51+
'requests == 2.18.3',
5252
],
5353
setup_requires=[
5454
'setuptools_git >= 1.1',

dev_tools/src/d1_dev/setup-all.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,8 @@ def main():
7777

7878
def run_setup(setup_dir_path, command_list):
7979
try:
80-
subprocess.check_call(
81-
['python', 'setup.py'] + command_list,
82-
cwd=setup_dir_path,
83-
)
80+
subprocess.check_call(['python', 'setup.py'] + command_list,
81+
cwd=setup_dir_path)
8482
except subprocess.CalledProcessError as e:
8583
logging.error('Setup failed. error="{}"'.format(str(e)))
8684
raise

dev_tools/src/setup.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
def main():
3030
setuptools.setup(
3131
name='dataone.dev',
32-
version='2.3.4',
32+
version='2.3.5',
3333
description='DataONE developer tools',
3434
author='DataONE Project',
3535
author_email='[email protected]',
@@ -46,6 +46,12 @@ def main():
4646
#'dataone.common == 2.3.0rc1',
4747
#'dataone.libclient == 2.3.0rc1',
4848
#
49+
# This is a hack to force a version of idna that is compatible with both
50+
# asn1crypto and requests. Without this, if asn1crypto is installed first,
51+
# it will install idna 2.6, and requests will fails due to the fact that
52+
# Python doesn't have a real package manager.
53+
'idna == 2.5',
54+
#
4955
'baron == 0.6.6',
5056
'pip == 9.0.1',
5157
'redbaron == 0.6.3',

gmn/src/d1_gmn/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2.3.4'
1+
__version__ = '2.3.5'

gmn/src/setup.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def main():
3131
# noinspection PyUnresolvedReferences
3232
setuptools.setup(
3333
name='dataone.gmn',
34-
version='2.3.4',
34+
version='2.3.5',
3535
description='DataONE Generic Member Node (GMN)',
3636
author='DataONE Project',
3737
author_email='[email protected]',
@@ -43,16 +43,16 @@ def main():
4343
'': ['settings.py'],
4444
},
4545
install_requires=[
46-
'dataone.cli == 2.3.4',
47-
'dataone.common == 2.3.4',
48-
'dataone.libclient == 2.3.4',
46+
'dataone.cli == 2.3.5',
47+
'dataone.common == 2.3.5',
48+
'dataone.libclient == 2.3.5',
4949
#
50-
'django == 1.11.2',
51-
'iso8601 == 0.1.11',
52-
'psycopg2 == 2.7.1',
50+
'django == 1.11.4',
51+
'iso8601 == 0.1.12',
52+
'psycopg2 == 2.7.3',
5353
'PyJWT == 1.5.2',
5454
'pyxb == 1.2.5',
55-
'requests == 2.18.1',
55+
'requests == 2.18.3',
5656
],
5757
setup_requires=[
5858
'setuptools_git >= 1.1',

lib_client/src/setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
def main():
2929
setuptools.setup(
3030
name='dataone.libclient',
31-
version='2.3.4',
31+
version='2.3.5',
3232
description='A DataONE client library for Python',
3333
author='DataONE Project',
3434
author_email='[email protected]',
@@ -37,12 +37,12 @@ def main():
3737
packages=setuptools.find_packages(),
3838
include_package_data=True,
3939
install_requires=[
40-
'dataone.common == 2.3.4',
40+
'dataone.common == 2.3.5',
4141
#
4242
'cachecontrol == 0.12.3',
4343
'pyxb == 1.2.5',
4444
'requests-toolbelt == 0.8.0',
45-
'requests[security] == 2.18.1',
45+
'requests[security] == 2.18.3',
4646
],
4747
setup_requires=[
4848
'setuptools_git >= 1.1',

lib_common/src/d1_common/const.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
)
3838

3939
# Version of the DataONE Python stack
40-
VERSION = '2.3.4'
40+
VERSION = '2.3.5'
4141

4242
# Maximum number of entries per list objects request
4343
MAX_LISTOBJECTS = 1000

lib_common/src/setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
def main():
2929
setuptools.setup(
3030
name='dataone.common',
31-
version='2.3.4',
31+
version='2.3.5',
3232
description=(
3333
'Contains functionality common to projects that interact with '
3434
'the DataONE infrastructure via Python'
@@ -41,10 +41,10 @@ def main():
4141
include_package_data=True,
4242
install_requires=[
4343
'contextlib2 == 0.5.5',
44-
'cryptography == 1.9',
45-
'iso8601 == 0.1.11',
44+
'cryptography == 2.0.3',
45+
'iso8601 == 0.1.12',
4646
'PyJWT == 1.5.2',
47-
'pyasn1 == 0.2.3',
47+
'pyasn1 == 0.3.2',
4848
'pyxb == 1.2.5',
4949
'rdflib == 4.2.2',
5050
],

0 commit comments

Comments
 (0)