Merge branch 'master' into stable

whole-tale · Dec 22, 2022 · ea5510a · ea5510a
2 parents eae80ce + c32dee3
commit ea5510a
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 
 setup(
     name='gwvolman',
-    version='1.2rc3',
+    version='1.2',
     description='An example girder worker extension',
     author='Kacper Kowalik',
     author_email='[email protected]',