Skip to content

Commit

Permalink
🔖 v1.8.6 (#57)
Browse files Browse the repository at this point in the history
  • Loading branch information
shnizzedy authored Jan 18, 2024
2 parents 9e2bab0 + 0ef1fd8 commit 584402b
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 57 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,13 @@ updates:
directory: /
schedule:
interval: monthly
- package-ecosystem: pip
directory: /
schedule:
interval: weekly
groups:
production dependencies:
dependency-type: production
development dependencies:
dependency-type: development
target-branch: develop
4 changes: 2 additions & 2 deletions .github/workflows/pythonpublish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v5
with:
python-version: 3.x
- name: Install dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test_cpac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ jobs:
singularity: [3.6.4]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install --upgrade pip setuptools wheel
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
- test_cpac
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install cpac
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog
=========

`Version 1.8.6: Support for C-PAC v1.8.6 <https://github.com/FCP-INDI/cpac/releases/tag/v1.8.6>`_
=====================================================================================================

* Fixes a bug in checking for C-PAC version
* Updates dependabot configuration

`Version 1.8.5: Support for C-PAC v1.8.5 <https://github.com/FCP-INDI/cpac/releases/tag/v1.8.5>`_
=====================================================================================================

Expand Down
90 changes: 42 additions & 48 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ classifiers = [
documentation = "https://fcp-indi.github.io/docs/latest/user/cpac"
readme = "README.rst"
repository = "https://github.com/FCP-INDI/cpac"
version = "1.8.5"
version = "1.8.6"

[tool.poetry.dependencies]
python = ">=3.8"
Expand Down
9 changes: 7 additions & 2 deletions src/cpac/utils/checks.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Functions to check things like the in-container C-PAC version."""
from packaging.version import Version
from semver import VersionInfo

from cpac.backends import Backends
Expand Down Expand Up @@ -26,6 +27,10 @@ def check_version_at_least(min_version, platform, image=None, tag=None):
if platform is None:
platform = "docker"
arg_vars = {"platform": platform, "image": image, "tag": tag, "command": "version"}
return VersionInfo.parse(min_version) <= VersionInfo.parse(
Backends(**arg_vars).run(run_type="version").versions.CPAC.lstrip("v")
return VersionInfo.parse(min_version) <= VersionInfo(
*(
Version(
Backends(**arg_vars).run(run_type="version").versions.CPAC.lstrip("v")
).release
)
)

0 comments on commit 584402b

Please sign in to comment.