Skip to content

Commit 584402b

Browse files
authored
🔖 v1.8.6 (#57)
2 parents 9e2bab0 + 0ef1fd8 commit 584402b

File tree

7 files changed

+72
-57
lines changed

7 files changed

+72
-57
lines changed

.github/dependabot.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,13 @@ updates:
99
directory: /
1010
schedule:
1111
interval: monthly
12+
- package-ecosystem: pip
13+
directory: /
14+
schedule:
15+
interval: weekly
16+
groups:
17+
production dependencies:
18+
dependency-type: production
19+
development dependencies:
20+
dependency-type: development
21+
target-branch: develop

.github/workflows/pythonpublish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
runs-on: ubuntu-latest
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
1717
- name: Set up Python
18-
uses: actions/setup-python@v1
18+
uses: actions/setup-python@v5
1919
with:
2020
python-version: 3.x
2121
- name: Install dependencies

.github/workflows/test_cpac.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ jobs:
2525
singularity: [3.6.4]
2626

2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v4
2929
- name: Set up Go
30-
uses: actions/setup-go@v2
30+
uses: actions/setup-go@v5
3131
with:
3232
go-version: ${{ matrix.go }}
3333
- name: Set up Python
34-
uses: actions/setup-python@v2
34+
uses: actions/setup-python@v5
3535
with:
3636
python-version: ${{ matrix.python }}
3737
- name: Install --upgrade pip setuptools wheel
@@ -87,7 +87,7 @@ jobs:
8787
- test_cpac
8888
runs-on: ubuntu-latest
8989
steps:
90-
- uses: actions/checkout@v2
90+
- uses: actions/checkout@v4
9191
with:
9292
fetch-depth: 0
9393
- name: Install cpac

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
Changelog
33
=========
44

5+
`Version 1.8.6: Support for C-PAC v1.8.6 <https://github.com/FCP-INDI/cpac/releases/tag/v1.8.6>`_
6+
=====================================================================================================
7+
8+
* Fixes a bug in checking for C-PAC version
9+
* Updates dependabot configuration
10+
511
`Version 1.8.5: Support for C-PAC v1.8.5 <https://github.com/FCP-INDI/cpac/releases/tag/v1.8.5>`_
612
=====================================================================================================
713

poetry.lock

Lines changed: 42 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ classifiers = [
2828
documentation = "https://fcp-indi.github.io/docs/latest/user/cpac"
2929
readme = "README.rst"
3030
repository = "https://github.com/FCP-INDI/cpac"
31-
version = "1.8.5"
31+
version = "1.8.6"
3232

3333
[tool.poetry.dependencies]
3434
python = ">=3.8"

src/cpac/utils/checks.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""Functions to check things like the in-container C-PAC version."""
2+
from packaging.version import Version
23
from semver import VersionInfo
34

45
from cpac.backends import Backends
@@ -26,6 +27,10 @@ def check_version_at_least(min_version, platform, image=None, tag=None):
2627
if platform is None:
2728
platform = "docker"
2829
arg_vars = {"platform": platform, "image": image, "tag": tag, "command": "version"}
29-
return VersionInfo.parse(min_version) <= VersionInfo.parse(
30-
Backends(**arg_vars).run(run_type="version").versions.CPAC.lstrip("v")
30+
return VersionInfo.parse(min_version) <= VersionInfo(
31+
*(
32+
Version(
33+
Backends(**arg_vars).run(run_type="version").versions.CPAC.lstrip("v")
34+
).release
35+
)
3136
)

0 commit comments

Comments
 (0)