Skip to content

Commit 322d5f8

Browse files
authored
Merge pull request #360 from davidhewitt/update-actions
Tidy up some CI
2 parents 0dc494e + ebc21c7 commit 322d5f8

File tree

5 files changed

+30
-33
lines changed

5 files changed

+30
-33
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
matrix:
140140
os: [ubuntu-latest, macos-latest, windows-latest]
141141
steps:
142-
- uses: actions/checkout@master
142+
- uses: actions/checkout@v3
143143
- name: Setup python
144144
uses: actions/setup-python@v4
145145
with:
@@ -206,7 +206,7 @@ jobs:
206206
{ target: "armv7-unknown-linux-gnueabihf", arch: "armv7" },
207207
]
208208
steps:
209-
- uses: actions/checkout@master
209+
- uses: actions/checkout@v3
210210
- name: Build wheels
211211
run: |
212212
echo 'set -ex
@@ -232,7 +232,7 @@ jobs:
232232
export DIST_EXTRA_CONFIG=/tmp/build-opts.cfg
233233
echo -e "[bdist_wheel]\npy_limited_api=cp37" > $DIST_EXTRA_CONFIG
234234
235-
cross-pip wheel --no-build-isolation --no-deps --wheel-dir dist .
235+
cross-pip wheel --no-build-isolation --no-deps --wheel-dir dist . -vv
236236
ls -la dist/
237237
python -m zipfile -l dist/*.whl # debug all files inside wheel file
238238
' > build-wheels.sh
@@ -382,7 +382,7 @@ jobs:
382382
{ msystem: MINGW32, arch: i686, path: mingw32, rust_target: i686-pc-windows-gnu }
383383
]
384384
steps:
385-
- uses: actions/checkout@v2
385+
- uses: actions/checkout@v3
386386
- name: Install MSys2 and dependencies
387387
uses: msys2/setup-msys2@v2
388388
with:
@@ -438,7 +438,7 @@ jobs:
438438
with:
439439
components: rust-src
440440
targets: wasm32-unknown-emscripten
441-
- uses: mymindstorm/setup-emsdk@v11
441+
- uses: mymindstorm/setup-emsdk@v12
442442
with:
443443
version: ${{env.EMSCRIPTEN_VERSION}}
444444
actions-cache-folder: emsdk-cache

examples/html-py-ever/.github/workflows/upload.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414
- name: Set up Python
1515
uses: actions/setup-python@v2
1616
with:
@@ -27,4 +27,4 @@ jobs:
2727
run: |
2828
python setup.py install --user
2929
cd test && python3 run_all.py
30-
twine upload dist/*
30+
twine upload dist/*

examples/html-py-ever/Cargo.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,7 @@ tendril = "0.4.3"
1313
name = "html_py_ever"
1414
crate-type = ["cdylib"]
1515
path = "rust/lib.rs"
16+
17+
[[bin]]
18+
name = "html-py-ever"
19+
path = "rust/main.rs"

examples/html-py-ever/pyproject.toml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,25 @@ build-backend = "setuptools.build_meta"
55
[project]
66
name = "html-py-ever"
77
version = "0.1.0"
8+
license = { text = "MIT" }
9+
readme = "README.md"
10+
requires-python = ">=3.6"
11+
classifiers = [
12+
"License :: OSI Approved :: MIT License",
13+
"Intended Audience :: Developers",
14+
"Programming Language :: Python :: 3",
15+
"Programming Language :: Python :: 3.6",
16+
"Programming Language :: Python :: 3.7",
17+
"Programming Language :: Python :: 3.8",
18+
"Programming Language :: Python :: 3.9",
19+
"Development Status :: 5 - Production/Stable",
20+
"Operating System :: POSIX",
21+
"Operating System :: MacOS :: MacOS X",
22+
"Operating System :: Microsoft :: Windows",
23+
]
24+
25+
[project.urls]
26+
Repository = "https://github.com/PyO3/setuptools-rust/blob/main/examples/html-py-ever"
827

928
[tool.setuptools.packages]
1029
# Pure Python packages/modules

examples/html-py-ever/setup.cfg

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)