From c32dee3a5a9bc72f488835d6b40ae38d2c389c8c Mon Sep 17 00:00:00 2001 From: "Kacper Kowalik (Xarthisius)" Date: Thu, 22 Dec 2022 10:20:04 -0600 Subject: [PATCH] Bump version to v1.2 --- Pipfile | 2 +- Pipfile.lock | 20 ++++++++++---------- gwvolman/constants.py | 2 +- gwvolman/tests/test_recorded_run.py | 2 +- requirements.txt | 2 +- setup.py | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Pipfile b/Pipfile index 10fa1827..41847757 100644 --- a/Pipfile +++ b/Pipfile @@ -19,7 +19,7 @@ girder-client = "==2.4.0" girder-worker = "==0.5.0" redis = "==3.5.3" requests = "*" -girderfs = {git = "https://github.com/whole-tale/girderfs",ref = "v1.2rc2"} +girderfs = {git = "https://github.com/whole-tale/girderfs",ref = "v1.2"} pyOpenSSL = "*" python-dateutil = "*" PyYAML = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 8e2865fa..247076e3 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "ed64cb97513614cd918428e973e1219b5d82d826db14d37e5fb1de5917ac0278" + "sha256": "0f96ef9f62e090610c1cca36eacf99a2868f6647944a1007560d615ff9c32160" }, "pipfile-spec": 6, "requires": { @@ -135,11 +135,11 @@ }, "attrs": { "hashes": [ - "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6", - "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c" + "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836", + "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99" ], - "markers": "python_version >= '3.5'", - "version": "==22.1.0" + "markers": "python_version >= '3.6'", + "version": "==22.2.0" }, "billiard": { "hashes": [ @@ -450,7 +450,7 @@ }, "girderfs": { "git": "https://github.com/whole-tale/girderfs", - "ref": "4c77c0f1cd028b6879fcd41039568cce42b4733e" + "ref": "abdaa09aee8f384c94cfd0ec082e91128d6898c7" }, "idna": { "hashes": [ @@ -1094,11 +1094,11 @@ "develop": { "attrs": { "hashes": [ - "sha256:29adc2665447e5191d0e7c568fde78b21f9672d344281d0c6e1ab085429b22b6", - "sha256:86efa402f67bf2df34f51a335487cf46b1ec130d02b8d39fd248abfd30da551c" + "sha256:29e95c7f6778868dbd49170f98f8818f78f3dc5e0e37c0b1f474e3561b240836", + "sha256:c9227bfc2f01993c03f68db37d1d15c9690188323c067c641f1a35ca58185f99" ], - "markers": "python_version >= '3.5'", - "version": "==22.1.0" + "markers": "python_version >= '3.6'", + "version": "==22.2.0" }, "certifi": { "hashes": [ diff --git a/gwvolman/constants.py b/gwvolman/constants.py index 443d3d35..22d11967 100644 --- a/gwvolman/constants.py +++ b/gwvolman/constants.py @@ -24,7 +24,7 @@ REPO2DOCKER_VERSION = os.environ.get( "REPO2DOCKER_VERSION", - "wholetale/repo2docker_wholetale:v1.2rc2" + "wholetale/repo2docker_wholetale:v1.2" ) CPR_VERSION = os.environ.get("CPR_VERSION", "wholetale/wt-cpr:latest") diff --git a/gwvolman/tests/test_recorded_run.py b/gwvolman/tests/test_recorded_run.py index 1b909d32..7b9ce5ca 100644 --- a/gwvolman/tests/test_recorded_run.py +++ b/gwvolman/tests/test_recorded_run.py @@ -38,7 +38,7 @@ def mock_gc_get(path, parameters=None): CONTAINER_CONFIG = ContainerConfig( buildpack="JupyterBuildPack", - repo2docker_version="wholetale/repo2docker_wholetale:v1.2rc2", + repo2docker_version="wholetale/repo2docker_wholetale:v1.2", image="abc123", command="test", mem_limit=2, diff --git a/requirements.txt b/requirements.txt index 6288abd8..72a44228 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,6 +14,6 @@ markdown dataone.common==3.4.7 dataone.libclient==3.4.7 dataone.cli==3.4.7 -git+https://github.com/whole-tale/girderfs@v1.2rc2#egg=girderfs +git+https://github.com/whole-tale/girderfs@v1.2#egg=girderfs python-dateutil pyparsing<3,>=2.0.2 # for packaging 21.2 ... diff --git a/setup.py b/setup.py index b88a73a8..298b41c7 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='gwvolman', - version='1.2rc3', + version='1.2', description='An example girder worker extension', author='Kacper Kowalik', author_email='xarthisius.kk@gmail.com',