Skip to content

Commit e05b0f8

Browse files
Merge pull request #439 from rapyuta-robotics/devel
🎉 release: v9.9.3
2 parents 0a34bba + c359b2b commit e05b0f8

File tree

4 files changed

+58
-20
lines changed

4 files changed

+58
-20
lines changed

.github/workflows/python-compatibility.yml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: 🐍 Python Compatibility Check
22
on: [ push ]
33

44
jobs:
5-
python-compatibility:
5+
linux-python-compatibility:
66
runs-on: ubuntu-latest
77
strategy:
88
matrix:
@@ -12,7 +12,7 @@ jobs:
1212
uses: actions/checkout@v4
1313

1414
- name: Install uv
15-
uses: astral-sh/setup-uv@v3
15+
uses: astral-sh/setup-uv@v6
1616

1717
- name: Set up Python ${{ matrix.python-version }}
1818
run: uv python install ${{ matrix.python-version }}
@@ -21,5 +21,27 @@ jobs:
2121
run: |
2222
export LC_ALL=C.UTF-8
2323
export LANG=C.UTF-8
24+
uv python pin ${{ matrix.python-version }}
25+
DEBUG=true uv run rio
26+
27+
windows-python-compatibility:
28+
runs-on: windows-latest
29+
permissions:
30+
contents: read
31+
strategy:
32+
matrix:
33+
python-version: [ '3.8.10', '3.9', '3.10', '3.11', '3.12', '3.13' ]
34+
steps:
35+
- name: Checkout Code
36+
uses: actions/checkout@v4
37+
38+
- name: Install uv
39+
uses: astral-sh/setup-uv@v6
40+
41+
- name: Set up Python ${{ matrix.python-version }}
42+
run: uv python install ${{ matrix.python-version }}
43+
44+
- name: Run the CLI
45+
run: |
2446
uv python pin ${{ matrix.python-version }}
2547
uv run rio

pyproject.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ dependencies = [
4343
"python-benedict>=0.33.2",
4444
"python-dateutil>=2.8.2",
4545
"python-hosts>=1.0.7",
46-
"python-magic>=0.4.27",
46+
"python-magic>=0.4.27; os_name != 'nt'",
47+
"python-magic-bin>=0.4.14; os_name == 'nt'",
4748
"pytz",
4849
"pyyaml>=5.4.1",
4950
"rapyuta_io>=2.3.1",

riocli/apply/util.py

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@
2222
import click
2323
import jinja2
2424
from yaspin.api import Yaspin
25-
from ansible.plugins.filter.core import FilterModule as CoreFilterModule
26-
from ansible.plugins.filter.urls import FilterModule as URLFilterModule
27-
from ansible.plugins.filter.urlsplit import FilterModule as URLSplitFilterModule
28-
from ansible.plugins.filter.mathstuff import FilterModule as MathFilterModule
29-
from ansible.plugins.filter.encryption import FilterModule as EncryptionFilterModule
3025

3126
from riocli.apply.filters import get_interface_ip, getenv
3227
from riocli.config import get_config_from_context
@@ -163,20 +158,29 @@ def init_jinja_environment():
163158
for name, func in FILTERS.items():
164159
environment.filters[name] = func
165160

166-
for name, func in CoreFilterModule().filters().items():
167-
environment.filters[name] = func
161+
try:
162+
from ansible.plugins.filter.core import FilterModule as CoreFilterModule
163+
from ansible.plugins.filter.urls import FilterModule as URLFilterModule
164+
from ansible.plugins.filter.urlsplit import FilterModule as URLSplitFilterModule
165+
from ansible.plugins.filter.mathstuff import FilterModule as MathFilterModule
166+
from ansible.plugins.filter.encryption import FilterModule as EncryptionFilterModule
168167

169-
for name, func in URLFilterModule().filters().items():
170-
environment.filters[name] = func
168+
for name, func in CoreFilterModule().filters().items():
169+
environment.filters[name] = func
171170

172-
for name, func in URLSplitFilterModule().filters().items():
173-
environment.filters[name] = func
171+
for name, func in URLFilterModule().filters().items():
172+
environment.filters[name] = func
174173

175-
for name, func in MathFilterModule().filters().items():
176-
environment.filters[name] = func
174+
for name, func in URLSplitFilterModule().filters().items():
175+
environment.filters[name] = func
177176

178-
for name, func in EncryptionFilterModule().filters().items():
179-
environment.filters[name] = func
177+
for name, func in MathFilterModule().filters().items():
178+
environment.filters[name] = func
179+
180+
for name, func in EncryptionFilterModule().filters().items():
181+
environment.filters[name] = func
182+
except ImportError:
183+
click.secho("Ansible filters are not supported", fg=Colors.YELLOW)
180184

181185
return environment
182186

uv.lock

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

0 commit comments

Comments
 (0)