From f3452a7dec24a492bbc7e2291bf01431e48862b4 Mon Sep 17 00:00:00 2001 From: Vanessa Sochat Date: Fri, 31 May 2019 09:55:13 -0400 Subject: [PATCH 1/3] testing with singularity 3.2.0 Signed-off-by: Vanessa Sochat --- .circleci/config.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e031790..7e987ce1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,6 +13,7 @@ workflows: branches: ignore: master - test-singularity-3-1-python-3: *ignore_master + - test-singularity-3-2-python-3: *ignore_master - test-singularity-3-python-2: *ignore_master - test-singularity-2-python-3: *ignore_master - test-singularity-2-python-2: *ignore_master @@ -132,6 +133,29 @@ jobs: - run: *test_spython - run: *test_spython_3 + test-singularity-3-2-python-3: + machine: true + working_directory: ~/repo + steps: + - checkout + - restore_cache: + keys: + - v1-dependencies-py3 + - run: *install_python_3 + - run: *waitforapt + - singularity/install-go: + go-version: 1.11.5 + - singularity/debian-install-3: + singularity-version: 3.2.0 + - run: *install_spython + - run: *install_dependencies + - save_cache: + paths: + - ~/conda + key: v1-dependencies-py3 + - run: *test_spython + - run: *test_spython_3 + test-singularity-3-python-2: machine: true working_directory: ~/repo From adf70b6d9d18dc3bb4dd1f58e8d99b01a10a7664 Mon Sep 17 00:00:00 2001 From: Vanessa Sochat Date: Fri, 31 May 2019 10:44:17 -0400 Subject: [PATCH 2/3] trying 3.2.1-1 with string for pre-release Signed-off-by: Vanessa Sochat --- spython/tests/test_oci.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spython/tests/test_oci.py b/spython/tests/test_oci.py index 19934276..a0c2f499 100644 --- a/spython/tests/test_oci.py +++ b/spython/tests/test_oci.py @@ -70,7 +70,7 @@ def test_oci(self): print(result) print(self.cli.version_info()) - if self.cli.version_info() >= VersionInfo(3, 2, 0): + if self.cli.version_info() >= VersionInfo(3, 2, 1, "1"): self.assertTrue(result['return_code'] == 255) else: self.assertTrue('bin' in result) @@ -96,7 +96,7 @@ def test_oci(self): self.assertEqual(state, 0) # State was still reported as running - if self.cli.version_info() >= VersionInfo(3, 2, 0): + if self.cli.version_info() >= VersionInfo(3, 2, 1, "1"): print('...check status of paused bundle.') state = self.cli.oci.state(self.name, sudo=True) self.assertEqual(state['status'], 'paused') From c759eba83b47c80a60c8eee1707cc9c4e9ee0b92 Mon Sep 17 00:00:00 2001 From: Vanessa Sochat Date: Fri, 31 May 2019 10:51:54 -0400 Subject: [PATCH 3/3] try 3.2.0-1 Signed-off-by: Vanessa Sochat --- spython/tests/test_oci.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spython/tests/test_oci.py b/spython/tests/test_oci.py index a0c2f499..89d570a0 100644 --- a/spython/tests/test_oci.py +++ b/spython/tests/test_oci.py @@ -70,7 +70,7 @@ def test_oci(self): print(result) print(self.cli.version_info()) - if self.cli.version_info() >= VersionInfo(3, 2, 1, "1"): + if self.cli.version_info() >= VersionInfo(3, 2, 0, "1"): self.assertTrue(result['return_code'] == 255) else: self.assertTrue('bin' in result) @@ -96,7 +96,7 @@ def test_oci(self): self.assertEqual(state, 0) # State was still reported as running - if self.cli.version_info() >= VersionInfo(3, 2, 1, "1"): + if self.cli.version_info() >= VersionInfo(3, 2, 0, "1"): print('...check status of paused bundle.') state = self.cli.oci.state(self.name, sudo=True) self.assertEqual(state['status'], 'paused')