Skip to content

Commit e65fd6f

Browse files
committed
Merge branch 'fix-ci'
2 parents e1c0b45 + 364dc31 commit e65fd6f

3 files changed

Lines changed: 11 additions & 9 deletions

File tree

.github/workflows/python-publish.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979

8080
# Now install the package from the local wheels and try to use it:
8181
- run: |
82-
pip install pyads --no-index --find-links ./dist
82+
pip install pyads-stlehmann --no-index --find-links ./dist
8383
python -c "import pyads; pyads.Connection(ams_net_id='127.0.0.1.1.1', ams_net_port=851)"
8484
8585
build_sdist:
@@ -101,7 +101,7 @@ jobs:
101101
upload_all:
102102
name: Upload to PyPi
103103
needs: [build_wheels, build_sdist, test_wheels, test_editable]
104-
environment: pypi
104+
environment: testpypi
105105
permissions:
106106
id-token: write
107107
runs-on: ubuntu-latest
@@ -111,4 +111,6 @@ jobs:
111111
pattern: cibw-*
112112
path: dist
113113
merge-multiple: true
114-
- uses: pypa/gh-action-pypi-publish@release/v1
114+
- uses: pypa/gh-action-pypi-publish@release/v1
115+
with:
116+
repository-url: https://test.pypi.org/legacy/

adslib

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[project]
2-
name = "pyads"
2+
name = "pyads-stlehmann"
33
description = "Python wrapper for TwinCAT ADS library"
44
authors = [
55
{ name = "Stefan Lehmann", email = "stlm@posteo.de" },
@@ -21,9 +21,6 @@ classifiers = [
2121
license = "MIT"
2222
license-files = ["LICENSE"]
2323
dynamic = ["version"]
24-
dependencies = [
25-
"setuptools>=82.0.0",
26-
]
2724
requires-python = ">= 3.9,<4"
2825
# Outdated Python versions are still included, until they cause problems (after which they will bed dropped)
2926
# Python 3.8 cannot be used anymore because of a setuptoools minimum version
@@ -72,8 +69,11 @@ pyads = ["adslib/**"]
7269
[tool.setuptools.dynamic]
7370
version = {attr = "pyads.__version__"}
7471

72+
[tool.cibuildwheel]
73+
before-all = "pip install meson ninja"
74+
7575
[tool.cibuildwheel.linux]
76-
before-all = "apt install -y meson"
76+
before-all = "yum install -y meson"
7777

7878
[tool.tox]
7979
legacy_tox_ini = """

0 commit comments

Comments
 (0)