Skip to content

Commit 7be20d5

Browse files
authored
Merge pull request #14 from DavidStirling/actions-security
Drop url wheels from project metadata
2 parents eb7dfdb + 61a4cb5 commit 7be20d5

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

.github/workflows/workflow.yml

+17-8
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,25 @@ jobs:
1212
# Keep running so we can see if other tests pass
1313
fail-fast: false
1414
matrix:
15-
python-version:
16-
- '3.9'
17-
- '3.10'
18-
- '3.11'
19-
- '3.12'
20-
os:
21-
- ubuntu-24.04
22-
include:
15+
include:
16+
- python-version: '3.9'
17+
os: ubuntu-24.04
18+
ice: "https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp39-cp39-manylinux_2_28_x86_64.whl"
19+
- python-version: '3.10'
20+
os: ubuntu-24.04
21+
ice: "https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp310-cp310-manylinux_2_28_x86_64.whl"
22+
- python-version: '3.11'
23+
os: ubuntu-24.04
24+
ice: "https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl"
25+
- python-version: '3.12'
26+
os: ubuntu-24.04
27+
ice: "https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp312-cp312-manylinux_2_28_x86_64.whl"
2328
- python-version: '3.10'
2429
os: macos-latest
30+
ice: "https://github.com/glencoesoftware/zeroc-ice-py-macos-universal2/releases/download/20240131/zeroc_ice-3.6.5-cp310-cp310-macosx_11_0_universal2.whl"
2531
- python-version: '3.9'
2632
os: windows-latest
33+
ice: "https://github.com/glencoesoftware/zeroc-ice-py-win-x86_64/releases/download/20240325/zeroc_ice-3.6.5-cp39-cp39-win_amd64.whl"
2734
runs-on: ${{ matrix.os }}
2835
steps:
2936
- uses: actions/checkout@v4
@@ -37,6 +44,8 @@ jobs:
3744
run: python -m pip install build flake8
3845
- name: Run flake8
3946
run: flake8 ./omero_user_token
47+
- name: Install zeroc-ice
48+
run: python -m pip install ${{ matrix.ice }}
4049
- name: Install package
4150
run: python -m pip install .[dev]
4251
- name: Run tests

pyproject.toml

+1-10
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,6 @@ omero-user-token = "omero_user_token.cli.omero_user_token:main"
3737

3838

3939
[project.optional-dependencies]
40-
dev = [
41-
"pytest",
42-
"zeroc-ice @ https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp39-cp39-manylinux_2_28_x86_64.whl ; platform_system=='Linux' and python_version=='3.9'",
43-
"zeroc-ice @ https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp310-cp310-manylinux_2_28_x86_64.whl ; platform_system=='Linux' and python_version=='3.10'",
44-
"zeroc-ice @ https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp311-cp311-manylinux_2_28_x86_64.whl ; platform_system=='Linux' and python_version=='3.11'",
45-
"zeroc-ice @ https://github.com/glencoesoftware/zeroc-ice-py-linux-x86_64/releases/download/20240202/zeroc_ice-3.6.5-cp312-cp312-manylinux_2_28_x86_64.whl ; platform_system=='Linux' and python_version=='3.12'",
46-
"zeroc-ice @ https://github.com/glencoesoftware/zeroc-ice-py-macos-x86_64/releases/download/20231130/zeroc_ice-3.6.5-cp39-cp39-macosx_11_0_x86_64.whl ; platform_system=='Darwin' and python_version=='3.9'",
47-
"zeroc-ice @ https://github.com/glencoesoftware/zeroc-ice-py-macos-universal2/releases/download/20240131/zeroc_ice-3.6.5-cp310-cp310-macosx_11_0_universal2.whl ; platform_system=='Darwin' and python_version=='3.10'",
48-
"zeroc-ice @ https://github.com/glencoesoftware/zeroc-ice-py-win-x86_64/releases/download/20240325/zeroc_ice-3.6.5-cp39-cp39-win_amd64.whl ; platform_system=='Windows' and python_version=='3.9'"
49-
]
40+
dev = ["pytest"]
5041

5142
[tool.setuptools_scm]

0 commit comments

Comments
 (0)