Skip to content

Commit 346d859

Browse files
committed
Bump deps to current, stack to 3.2.0
1 parent 72bebff commit 346d859

File tree

15 files changed

+133
-88
lines changed

15 files changed

+133
-88
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,9 @@ Update the `requirements.txt` file:
303303

304304
$ pip freeze > requirements.txt
305305

306-
The DataONE Python stack specifies fixed versions of all its dependencies. This ensures that a stack deployed to production matches one that passed the tests. As updating the versions in the `setup.py` files manually is time consuming and error prone, a script is included that automates the task. The script updates the version information for the dependencies in the `setup.py` files to match the versions of the currently installed dependencies. Run the script with:
306+
The DataONE Python stack specifies the versions that were tested in CI builds before release as the lowest required versions, and allows any later versions to be installed as part of regular maintenance.
307+
308+
As updating the versions in the `setup.py` files manually is time consuming and error prone, a script is included that automates the task. The script updates the version information for the dependencies in the `setup.py` files to match the versions of the currently installed dependencies. Run the script with:
307309

308310
$ cd d1_python
309311
$ src-sync-dependencies.py . <version>

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='3.0.4',
31+
version='3.2.0',
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 >= 3.0.4',
41-
'dataone.libclient >= 3.0.4',
40+
'dataone.common >= 3.2.0',
41+
'dataone.libclient >= 3.2.0',
4242
#
43-
'requests >= 2.18.4',
43+
'requests >= 2.19.1',
4444
],
4545
entry_points={'console_scripts': [
4646
'dataone = d1_cli.dataone:main',

client_onedrive/src/setup.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
def main():
3232
setuptools.setup(
3333
name='dataone.onedrive',
34-
version='3.0.4',
34+
version='3.2.0',
3535
description='Filesystem access to the DataONE Workspace',
3636
author='DataONE Project',
3737
author_email='[email protected]',
@@ -40,14 +40,14 @@ def main():
4040
packages=setuptools.find_packages(),
4141
include_package_data=True,
4242
install_requires=[
43-
'dataone.common >= 3.0.4',
44-
'dataone.libclient >= 3.0.4',
43+
'dataone.common >= 3.2.0',
44+
'dataone.libclient >= 3.2.0',
4545
#
46-
'fusepy >= 2.0.4',
46+
'fusepy >= 3.0.1',
4747
'pyxb >= 1.2.6',
48-
'pyzotero >= 1.3.2',
48+
'pyzotero >= 1.3.6',
4949
'rdflib >= 4.2.2',
50-
'requests >= 2.18.4',
50+
'requests >= 2.19.1',
5151
],
5252
setup_requires=[
5353
'setuptools_git >= 1.1',

dev_tools/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.dev',
31-
version='3.0.4',
31+
version='3.2.0',
3232
description='DataONE developer tools',
3333
author='DataONE Project',
3434
author_email='[email protected]',
@@ -51,9 +51,9 @@ def main():
5151
# Python doesn't have a real package manager.
5252
'idna == 2.6',
5353
#
54-
'baron >= 0.6.6',
55-
'pip >= 10.0.1',
56-
'redbaron >= 0.6.3',
54+
'baron >= 0.7',
55+
'pip >= 18.1',
56+
'redbaron >= 0.7.1',
5757
],
5858
setup_requires=[
5959
'setuptools_git >= 1.1',

gmn/src/d1_gmn/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
# See the License for the specific language governing permissions and
1717
# limitations under the License.
1818

19-
__version__ = '3.0.4'
19+
__version__ = '3.2.0'

gmn/src/setup.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def main():
3030
# noinspection PyUnresolvedReferences
3131
setuptools.setup(
3232
name='dataone.gmn',
33-
version='3.0.4',
33+
version='3.2.0',
3434
description='DataONE Generic Member Node (GMN)',
3535
author='DataONE Project',
3636
author_email='[email protected]',
@@ -42,17 +42,17 @@ def main():
4242
'': ['settings.py'],
4343
},
4444
install_requires=[
45-
'dataone.cli >= 3.0.4',
46-
'dataone.common >= 3.0.4',
47-
'dataone.libclient >= 3.0.4',
48-
'dataone.scimeta >= 3.0.4',
45+
'dataone.cli >= 3.2.0',
46+
'dataone.common >= 3.2.0',
47+
'dataone.libclient >= 3.2.0',
48+
'dataone.scimeta >= 3.2.0',
4949
#
50-
'django >= 2.0.6',
50+
'django >= 2.1.2',
5151
'iso8601 >= 0.1.12',
52-
'psycopg2 >= 2.7.4',
52+
'psycopg2 >= 2.7.5',
5353
'PyJWT >= 1.6.4',
5454
'pyxb >= 1.2.6',
55-
'requests >= 2.18.4',
55+
'requests >= 2.19.1',
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='3.0.4',
31+
version='3.2.0',
3232
description='A DataONE client library for Python',
3333
author='DataONE Project',
3434
author_email='[email protected]',
@@ -37,11 +37,11 @@ def main():
3737
packages=setuptools.find_packages(),
3838
include_package_data=True,
3939
install_requires=[
40-
'dataone.common >= 3.0.4',
40+
'dataone.common >= 3.2.0',
4141
#
4242
'pyxb >= 1.2.6',
4343
'requests-toolbelt >= 0.8.0',
44-
'requests[security] >= 2.18.4',
44+
'requests[security] >= 2.19.1',
4545
],
4646
setup_requires=[
4747
'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 = '3.0.4'
40+
VERSION = '3.2.0'
4141

4242
# Default number of items in a single page of a multi-page result set
4343
DEFAULT_SLICE_SIZE = 100

lib_common/src/d1_common/xml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def etree_from_xml(xml_str, encoding='utf-8'):
203203

204204

205205
def _compare_attr(a_tree, b_tree):
206-
for a_el in a_tree.getiterator():
206+
for a_el in a_tree.iter():
207207
b_el = _find_corresponding_element(a_el, a_tree, b_tree)
208208
for attr_name, attr_val in list(a_el.items()):
209209
_validate_element_attr(b_tree, b_el, attr_name, attr_val)

lib_common/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.common',
31-
version='3.0.4',
31+
version='3.2.0',
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 >= 2.2.2',
44+
'cryptography >= 2.3.1',
4545
'iso8601 >= 0.1.12',
4646
'PyJWT >= 1.6.4',
47-
'pyasn1 >= 0.4.3',
47+
'pyasn1 >= 0.4.4',
4848
'pyxb >= 1.2.6',
4949
'rdflib >= 4.2.2',
5050
'zipstream >= 1.1.4',

0 commit comments

Comments
 (0)