From 1251462b31683aab7e43ecd5f0219867869da066 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 07:56:48 +0000 Subject: [PATCH 1/2] Bump mypy from 1.7.1 to 1.8.0 Bumps [mypy](https://github.com/python/mypy) from 1.7.1 to 1.8.0. - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](https://github.com/python/mypy/compare/v1.7.1...v1.8.0) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- mypy-requirements.txt | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mypy-requirements.txt b/mypy-requirements.txt index b272f1129..060e84e7a 100644 --- a/mypy-requirements.txt +++ b/mypy-requirements.txt @@ -1,4 +1,4 @@ -mypy==1.7.1 # also update pyproject.toml +mypy==1.8.0 # also update pyproject.toml ruamel.yaml>=0.16.0,<0.19 cwl-utils>=0.32 types-requests diff --git a/pyproject.toml b/pyproject.toml index 1f7f3a5ec..0c427a7f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,7 @@ requires = [ "setuptools>=45", "setuptools_scm[toml]>=8.0.4,<9", - "mypy==1.7.1", # also update mypy-requirements.txt + "mypy==1.8.0", # also update mypy-requirements.txt "types-requests", "types-psutil", "importlib_resources>=1.4;python_version<'3.9'", From a1ff74d6d6d04aed72d474937b3cbc920ba4e5cd Mon Sep 17 00:00:00 2001 From: "Michael R. Crusoe" Date: Wed, 3 Jan 2024 14:50:02 +0100 Subject: [PATCH 2/2] upgrade udocker version used for testing to 1.3.12 --- tests/test_udocker.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test_udocker.py b/tests/test_udocker.py index eb9a0ebfe..63ad97191 100644 --- a/tests/test_udocker.py +++ b/tests/test_udocker.py @@ -11,6 +11,7 @@ from .util import get_data, get_main_output, working_directory LINUX = sys.platform in ("linux", "linux2") +UDOCKER_VERSION = "1.3.12" @pytest.fixture(scope="session") @@ -19,10 +20,13 @@ def udocker(tmp_path_factory: TempPathFactory) -> str: test_environ = copy.copy(os.environ) docker_install_dir = str(tmp_path_factory.mktemp("udocker")) with working_directory(docker_install_dir): - url = "https://github.com/indigo-dc/udocker/releases/download/1.3.5/udocker-1.3.5.tar.gz" + url = ( + "https://github.com/indigo-dc/udocker/releases/download/" + f"{UDOCKER_VERSION}/udocker-{UDOCKER_VERSION}.tar.gz" + ) install_cmds = [ ["curl", "-L", url, "-o", "./udocker-tarball.tgz"], - ["tar", "xzvf", "udocker-tarball.tgz"], + ["tar", "--strip-components=1", "-xzvf", "udocker-tarball.tgz"], ["./udocker/udocker", "install"], ]