Skip to content

Commit 1f24166

Browse files
rogerdahlrogerdahl
committed
Bump to 3.5.0 and all deps to current as of 2020-08-09
1 parent f25761f commit 1f24166

File tree

15 files changed

+184
-145
lines changed

15 files changed

+184
-145
lines changed

‎client_cli/src/d1_cli/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.4.7'
19+
__version__ = '3.5.0'

‎client_cli/src/setup.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
def main():
2727
setuptools.setup(
2828
name="dataone.cli",
29-
version='3.4.7',
29+
version='3.5.0',
3030
description="Command-Line Interface (CLI) for DataONE",
3131
author="DataONE Project",
3232
author_email="[email protected]",
@@ -35,10 +35,10 @@ def main():
3535
packages=setuptools.find_packages(),
3636
include_package_data=True,
3737
install_requires=[
38-
"dataone.common >= 3.4.7",
39-
"dataone.libclient >= 3.4.7",
38+
"dataone.common >= 3.5.0",
39+
"dataone.libclient >= 3.5.0",
4040
#
41-
"requests >= 2.22.0",
41+
"requests >= 2.24.0",
4242
],
4343
entry_points={"console_scripts": ["dataone = d1_cli.dataone:main"]},
4444
setup_requires=["setuptools_git >= 1.1"],

‎client_onedrive/src/setup.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
def main():
2828
setuptools.setup(
2929
name="dataone.onedrive",
30-
version='3.4.7',
30+
version='3.5.0',
3131
description="Filesystem access to the DataONE Workspace",
3232
author="DataONE Project",
3333
author_email="[email protected]",
@@ -36,14 +36,14 @@ def main():
3636
packages=setuptools.find_packages(),
3737
include_package_data=True,
3838
install_requires=[
39-
"dataone.common >= 3.4.7",
40-
"dataone.libclient >= 3.4.7",
39+
"dataone.common >= 3.5.0",
40+
"dataone.libclient >= 3.5.0",
4141
#
4242
"fusepy >= 3.0.1",
4343
"pyxb >= 1.2.6",
44-
"pyzotero >= 1.4.4",
45-
"rdflib >= 4.2.2",
46-
"requests >= 2.22.0",
44+
"pyzotero >= 1.4.16",
45+
"rdflib >= 5.0.0",
46+
"requests >= 2.24.0",
4747
],
4848
setup_requires=["setuptools_git >= 1.1"],
4949
classifiers=[

‎dev_tools/src/setup.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
def main():
2727
setuptools.setup(
2828
name="dataone.dev",
29-
version='3.4.7',
29+
version='3.5.0',
3030
description="DataONE developer tools",
3131
author="DataONE Project",
3232
author_email="[email protected]",
@@ -47,7 +47,7 @@ def main():
4747
# 'idna == 2.6',
4848
#
4949
"baron >= 0.9",
50-
"pip >= 19.1.1",
50+
"pip >= 20.2.1",
5151
"redbaron >= 0.9.2",
5252
"sphinx",
5353
"sphinx-better-theme",

‎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.4.7'
19+
__version__ = '3.5.0'

‎gmn/src/setup.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def main():
2828
# noinspection PyUnresolvedReferences
2929
setuptools.setup(
3030
name="dataone.gmn",
31-
version='3.4.7',
31+
version='3.5.0',
3232
description="DataONE Generic Member Node (GMN)",
3333
author="DataONE Project",
3434
author_email="[email protected]",
@@ -37,17 +37,17 @@ def main():
3737
packages=setuptools.find_packages(),
3838
include_package_data=True,
3939
install_requires=[
40-
"dataone.cli >= 3.4.7",
41-
"dataone.common >= 3.4.7",
42-
"dataone.libclient >= 3.4.7",
43-
"dataone.scimeta >= 3.4.7",
40+
"dataone.cli >= 3.5.0",
41+
"dataone.common >= 3.5.0",
42+
"dataone.libclient >= 3.5.0",
43+
"dataone.scimeta >= 3.5.0",
4444
#
45-
"django >= 2.2.3",
45+
"django >= 3.1",
4646
"iso8601 >= 0.1.12",
47-
"psycopg2-binary >= 2.8.3",
47+
"psycopg2-binary >= 2.8.5",
4848
"PyJWT >= 1.7.1",
4949
"pyxb >= 1.2.6",
50-
"requests >= 2.22.0",
50+
"requests >= 2.24.0",
5151
],
5252
setup_requires=["setuptools_git >= 1.1"],
5353
entry_points={"console_scripts": "d1-gmn = d1_gmn.manage:main"},

‎lib_client/src/setup.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
def main():
2727
setuptools.setup(
2828
name="dataone.libclient",
29-
version='3.4.7',
29+
version='3.5.0',
3030
description="A DataONE client library for Python",
3131
author="DataONE Project",
3232
author_email="[email protected]",
@@ -35,12 +35,12 @@ def main():
3535
packages=setuptools.find_packages(),
3636
include_package_data=True,
3737
install_requires=[
38-
"dataone.common >= 3.4.7",
38+
"dataone.common >= 3.5.0",
3939
#
4040
"pyxb >= 1.2.6",
4141
"requests-toolbelt >= 0.9.1",
42-
"requests[security] >= 2.22.0",
43-
"aiohttp >= 3.5.4",
42+
"requests[security] >= 2.24.0",
43+
"aiohttp >= 3.6.2",
4444
],
4545
setup_requires=["setuptools_git >= 1.1"],
4646
classifiers=[

‎lib_common/src/d1_common/const.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
URL_DATAONE_SEARCH = "https://search.dataone.org"
3737

3838
# Version of the DataONE Python stack
39-
VERSION = '3.4.7'
39+
VERSION = '3.5.0'
4040

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

‎lib_common/src/d1_common/object_format_cache.json‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@
332332
"property_list": []
333333
}
334334
},
335-
"_last_refresh_timestamp": "2019-07-11 23:17:49.987001+00:00",
335+
"_last_refresh_timestamp": "2020-08-03 05:34:18.485143+00:00",
336336
"anvl/erc-v02": {
337337
"extension": ".anvl",
338338
"format_name": "Kernel Metadata and Electronic Resource Citations (ERCs), 2010.05.13",
@@ -954,6 +954,33 @@
954954
"property_list": []
955955
}
956956
},
957+
"https://eml.ecoinformatics.org/eml-2.2.0": {
958+
"extension": ".xml",
959+
"format_name": "Ecological Metadata Language, version 2.2.0",
960+
"format_type": "METADATA",
961+
"media_type": {
962+
"name": "text/xml",
963+
"property_list": []
964+
}
965+
},
966+
"https://purl.dataone.org/collections-1.0.0": {
967+
"extension": ".xml",
968+
"format_name": "Dataset collections v1.0.0",
969+
"format_type": "METADATA",
970+
"media_type": {
971+
"name": "text/xml",
972+
"property_list": []
973+
}
974+
},
975+
"https://purl.dataone.org/portals-1.0.0": {
976+
"extension": ".xml",
977+
"format_name": "Dataset portals v1.0.0",
978+
"format_type": "METADATA",
979+
"media_type": {
980+
"name": "text/xml",
981+
"property_list": []
982+
}
983+
},
957984
"image/bmp": {
958985
"extension": ".bmp",
959986
"format_name": "Bitmap Image File",

‎lib_common/src/setup.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
def main():
2727
setuptools.setup(
2828
name="dataone.common",
29-
version='3.4.7',
29+
version='3.5.0',
3030
description=(
3131
"Contains functionality common to projects that interact with "
3232
"the DataONE infrastructure via Python"
@@ -38,12 +38,12 @@ def main():
3838
packages=setuptools.find_packages(),
3939
include_package_data=True,
4040
install_requires=[
41-
"cryptography >= 2.7",
41+
"cryptography >= 3.0",
4242
"iso8601 >= 0.1.12",
4343
"PyJWT >= 1.7.1",
44-
"pyasn1 >= 0.4.5",
44+
"pyasn1 >= 0.4.8",
4545
"pyxb >= 1.2.6",
46-
"rdflib >= 4.2.2",
46+
"rdflib >= 5.0.0",
4747
"zipstream >= 1.1.4",
4848
],
4949
setup_requires=["setuptools_git >= 1.1"],

0 commit comments

Comments
 (0)