Bump to 3.5.0 and all deps to current as of 2020-08-09

DataONEorg · Aug 10, 2020 · 1f24166 · 1f24166
1 parent f25761f
commit 1f24166
Show file tree

Hide file tree

Showing 15 changed files with 184 additions and 145 deletions.
diff --git a/client_cli/src/d1_cli/version.py b/client_cli/src/d1_cli/version.py
@@ -16,4 +16,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '3.4.7'
+__version__ = '3.5.0'
diff --git a/client_cli/src/setup.py b/client_cli/src/setup.py
@@ -26,7 +26,7 @@
 def main():
     setuptools.setup(
         name="dataone.cli",
-        version='3.4.7',
+        version='3.5.0',
         description="Command-Line Interface (CLI) for DataONE",
         author="DataONE Project",
         author_email="[email protected]",
@@ -35,10 +35,10 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "dataone.common >= 3.4.7",
-            "dataone.libclient >= 3.4.7",
+            "dataone.common >= 3.5.0",
+            "dataone.libclient >= 3.5.0",
             #
-            "requests >= 2.22.0",
+            "requests >= 2.24.0",
         ],
         entry_points={"console_scripts": ["dataone = d1_cli.dataone:main"]},
         setup_requires=["setuptools_git >= 1.1"],

diff --git a/client_onedrive/src/setup.py b/client_onedrive/src/setup.py
@@ -27,7 +27,7 @@
 def main():
     setuptools.setup(
         name="dataone.onedrive",
-        version='3.4.7',
+        version='3.5.0',
         description="Filesystem access to the DataONE Workspace",
         author="DataONE Project",
         author_email="[email protected]",
@@ -36,14 +36,14 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "dataone.common >= 3.4.7",
-            "dataone.libclient >= 3.4.7",
+            "dataone.common >= 3.5.0",
+            "dataone.libclient >= 3.5.0",
             #
             "fusepy >= 3.0.1",
             "pyxb >= 1.2.6",
-            "pyzotero >= 1.4.4",
-            "rdflib >= 4.2.2",
-            "requests >= 2.22.0",
+            "pyzotero >= 1.4.16",
+            "rdflib >= 5.0.0",
+            "requests >= 2.24.0",
         ],
         setup_requires=["setuptools_git >= 1.1"],
         classifiers=[

diff --git a/dev_tools/src/setup.py b/dev_tools/src/setup.py
@@ -26,7 +26,7 @@
 def main():
     setuptools.setup(
         name="dataone.dev",
-        version='3.4.7',
+        version='3.5.0',
         description="DataONE developer tools",
         author="DataONE Project",
         author_email="[email protected]",
@@ -47,7 +47,7 @@ def main():
             # 'idna == 2.6',
             #
             "baron >= 0.9",
-            "pip >= 19.1.1",
+            "pip >= 20.2.1",
             "redbaron >= 0.9.2",
             "sphinx",
             "sphinx-better-theme",

diff --git a/gmn/src/d1_gmn/version.py b/gmn/src/d1_gmn/version.py
@@ -16,4 +16,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__ = '3.4.7'
+__version__ = '3.5.0'
diff --git a/gmn/src/setup.py b/gmn/src/setup.py
@@ -28,7 +28,7 @@ def main():
     # noinspection PyUnresolvedReferences
     setuptools.setup(
         name="dataone.gmn",
-        version='3.4.7',
+        version='3.5.0',
         description="DataONE Generic Member Node (GMN)",
         author="DataONE Project",
         author_email="[email protected]",
@@ -37,17 +37,17 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "dataone.cli >= 3.4.7",
-            "dataone.common >= 3.4.7",
-            "dataone.libclient >= 3.4.7",
-            "dataone.scimeta >= 3.4.7",
+            "dataone.cli >= 3.5.0",
+            "dataone.common >= 3.5.0",
+            "dataone.libclient >= 3.5.0",
+            "dataone.scimeta >= 3.5.0",
             #
-            "django >= 2.2.3",
+            "django >= 3.1",
             "iso8601 >= 0.1.12",
-            "psycopg2-binary >= 2.8.3",
+            "psycopg2-binary >= 2.8.5",
             "PyJWT >= 1.7.1",
             "pyxb >= 1.2.6",
-            "requests >= 2.22.0",
+            "requests >= 2.24.0",
         ],
         setup_requires=["setuptools_git >= 1.1"],
         entry_points={"console_scripts": "d1-gmn = d1_gmn.manage:main"},

diff --git a/lib_client/src/setup.py b/lib_client/src/setup.py
@@ -26,7 +26,7 @@
 def main():
     setuptools.setup(
         name="dataone.libclient",
-        version='3.4.7',
+        version='3.5.0',
         description="A DataONE client library for Python",
         author="DataONE Project",
         author_email="[email protected]",
@@ -35,12 +35,12 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "dataone.common >= 3.4.7",
+            "dataone.common >= 3.5.0",
             #
             "pyxb >= 1.2.6",
             "requests-toolbelt >= 0.9.1",
-            "requests[security] >= 2.22.0",
-            "aiohttp >= 3.5.4",
+            "requests[security] >= 2.24.0",
+            "aiohttp >= 3.6.2",
         ],
         setup_requires=["setuptools_git >= 1.1"],
         classifiers=[

diff --git a/lib_common/src/d1_common/const.py b/lib_common/src/d1_common/const.py
@@ -36,7 +36,7 @@
 URL_DATAONE_SEARCH = "https://search.dataone.org"
 
 # Version of the DataONE Python stack
-VERSION = '3.4.7'
+VERSION = '3.5.0'
 
 # Default number of items in a single page of a multi-page result set
 DEFAULT_SLICE_SIZE = 100

diff --git a/lib_common/src/d1_common/object_format_cache.json b/lib_common/src/d1_common/object_format_cache.json
@@ -332,7 +332,7 @@
       "property_list": []
     }
   },
-  "_last_refresh_timestamp": "2019-07-11 23:17:49.987001+00:00",
+  "_last_refresh_timestamp": "2020-08-03 05:34:18.485143+00:00",
   "anvl/erc-v02": {
     "extension": ".anvl",
     "format_name": "Kernel Metadata and Electronic Resource Citations (ERCs), 2010.05.13",
@@ -954,6 +954,33 @@
       "property_list": []
     }
   },
+  "https://eml.ecoinformatics.org/eml-2.2.0": {
+    "extension": ".xml",
+    "format_name": "Ecological Metadata Language, version 2.2.0",
+    "format_type": "METADATA",
+    "media_type": {
+      "name": "text/xml",
+      "property_list": []
+    }
+  },
+  "https://purl.dataone.org/collections-1.0.0": {
+    "extension": ".xml",
+    "format_name": "Dataset collections v1.0.0",
+    "format_type": "METADATA",
+    "media_type": {
+      "name": "text/xml",
+      "property_list": []
+    }
+  },
+  "https://purl.dataone.org/portals-1.0.0": {
+    "extension": ".xml",
+    "format_name": "Dataset portals v1.0.0",
+    "format_type": "METADATA",
+    "media_type": {
+      "name": "text/xml",
+      "property_list": []
+    }
+  },
   "image/bmp": {
     "extension": ".bmp",
     "format_name": "Bitmap Image File",

diff --git a/lib_common/src/setup.py b/lib_common/src/setup.py
@@ -26,7 +26,7 @@
 def main():
     setuptools.setup(
         name="dataone.common",
-        version='3.4.7',
+        version='3.5.0',
         description=(
             "Contains functionality common to projects that interact with "
             "the DataONE infrastructure via Python"
@@ -38,12 +38,12 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "cryptography >= 2.7",
+            "cryptography >= 3.0",
             "iso8601 >= 0.1.12",
             "PyJWT >= 1.7.1",
-            "pyasn1 >= 0.4.5",
+            "pyasn1 >= 0.4.8",
             "pyxb >= 1.2.6",
-            "rdflib >= 4.2.2",
+            "rdflib >= 5.0.0",
             "zipstream >= 1.1.4",
         ],
         setup_requires=["setuptools_git >= 1.1"],

diff --git a/lib_csw/src/setup.py b/lib_csw/src/setup.py
@@ -27,7 +27,7 @@ def main():
     # noinspection PyUnresolvedReferences
     setuptools.setup(
         name="dataone.csw",
-        version='3.4.7',
+        version='3.5.0',
         description="DataONE OpenGIS Catalogue Service for the Web (CSW) Harvester",
         author="DataONE Project",
         author_email="[email protected]",
@@ -36,9 +36,9 @@ def main():
         packages=setuptools.find_packages(),
         include_package_data=True,
         install_requires=[
-            "dataone.common >= 3.4.7",
-            "dataone.libclient >= 3.4.7",
-            "dataone.scimeta >= 3.4.7",
+            "dataone.common >= 3.5.0",
+            "dataone.libclient >= 3.5.0",
+            "dataone.scimeta >= 3.5.0",
             #
         ],
         setup_requires=["setuptools_git >= 1.1"],

diff --git a/lib_scimeta/src/setup.py b/lib_scimeta/src/setup.py
@@ -26,15 +26,15 @@
 def main():
     setuptools.setup(
         name="dataone.scimeta",
-        version='3.4.7',
+        version='3.5.0',
         description="Utilities for processing Science Metadata",
         author="DataONE Project",
         author_email="[email protected]",
         url="https://github.com/DataONEorg/d1_python",
         license="Apache License, Version 2.0",
         packages=setuptools.find_packages(),
         include_package_data=True,
-        install_requires=["lxml >= 4.3.4"],
+        install_requires=["lxml >= 4.5.2"],
         setup_requires=["setuptools_git >= 1.1"],
         classifiers=[
             "Development Status :: 5 - Production/Stable",