Fix CI to work with upstream adslib

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
   pull_request:
     branches: [ master ]
 
-  # Allows you to run this worflow manually from the Actions tab
+  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
@@ -17,9 +17,11 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        python-version: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
 
     steps:
+    - name: Install build tools
+      run: sudo apt update && sudo apt install -y meson 
     - name: Checkout repository and submodules
       uses: actions/checkout@v4
       with:
@@ -28,16 +30,10 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install package (with dependencies)
+    - name: Install package, dependencies and tools
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 pytest coverage coveralls pytest-cov setuptools
-    - name: Build adslib
-      run: |
-        python setup.py build
-    - name: Install package
-      run: |
-        python setup.py develop        
+        python -m pip install .[tests,dev]
     - name: Test with pytest
       run: |
         pytest -v --cov pyads

.github/workflows/python-publish.yml

@@ -1,5 +1,7 @@
-# This workflow will upload a Python Package using Twine when a release is created
-# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries
+#
+# This workflow will build multiple Python wheels and upload the packages when a release is created
+# For more information see: https://cibuildwheel.pypa.io/en/stable/ci-services/#github-actions
+#
 
 name: Upload Python Package
 
@@ -10,26 +12,105 @@ on:
   workflow_dispatch: # allow running the workflow manually
 
 jobs:
-  deploy:
 
+  test_editable:
+    name: Test editable install
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
-      with:
-        submodules: recursive
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install build twine
-    - name: Build and publish
-      env:
-        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: |
-        python -m build
-        twine upload dist/*
+      - name: Install build tools
+        run: sudo apt update && sudo apt install -y meson
+      - uses: actions/checkout@v4
+        with:
+          submodules: "true"
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+      - run: |
+          pip install -e . -vv
+          python -c "import pyads; pyads.Connection(ams_net_id='127.0.0.1.1.1', ams_net_port=851)"
+
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        # macos-15-intel is an Intel runner, macos-14 is Apple silicon
+        os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, windows-11-arm, macos-15-intel, macos-latest]
+
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: recursive
+
+      - name: Build wheels
+        uses: pypa/cibuildwheel@v3.3.1
+        env:
+          # We only compile `adslib`, with no link to Python at all, so we only need to pick a single Python version
+          # We will fairly the different OS flavours
+          CIBW_BUILD: "cp314-*"
+          # Skip the versions that give errors during building:
+          CIBW_SKIP: "*-musllinux_*"
+          # Full matrix: https://cibuildwheel.pypa.io/en/stable/options/#build-skip
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}
+          path: ./wheelhouse/*.whl
+
+  test_wheels:
+    name: Test distributions
+    needs: build_wheels 
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, ubuntu-24.04-arm, macos-15-intel, macos-latest]
+        # Can't really test with Windows because 'TcAdsDll.dll' will be missing
+
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}
+          path: dist
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.13"
+
+      # Now install the package from the local wheels and try to use it:
+      - run: |
+          pip install pyads-stlehmann --no-index --find-links ./dist
+          python -c "import pyads; pyads.Connection(ams_net_id='127.0.0.1.1.1', ams_net_port=851)" 
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: true
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
+
+  upload_all:
+      name: Upload to PyPi
+      needs: [build_wheels, build_sdist, test_wheels, test_editable]
+      environment: testpypi
+      permissions:
+        id-token: write
+      runs-on: ubuntu-latest
+      steps:
+      - uses: actions/download-artifact@v5
+        with:
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          repository-url: https://test.pypi.org/legacy/

.readthedocs.yaml

@@ -4,17 +4,17 @@
 # Required
 version: 2
 
-# include adslib submodulee
+# include adslib submodule
 submodules:
   include: 
     - adslib
   recursive: true
 
 # Set the OS, Python version and other tools you might need
 build:
-  os: ubuntu-22.04
+  os: ubuntu-24.04
   tools:
-    python: "3.12"
+    python: "3.13"
 
 # Build documentation in the "docs/" directory with Sphinx
 sphinx:
@@ -27,4 +27,3 @@ python:
     - requirements: requirements.txt
     - method: pip
       path: .
-

CHANGELOG.md

@@ -4,10 +4,43 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## 3.5.1 (Unreleased)
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Removed
+
+## 3.6
+
+### Added
+
+### Changed
+* [#502](https://github.com/stlehmann/pyads/pull/502) Update adslib to Upstream version 113.0.31-1
+
+### Removed
+
+## 3.5.2
+
+### Added
+* [#487](https://github.com/stlehmann/pyads/issues/487) Switch to cibuildwheel for building wheels in CI (including Windows, Linux and MacOS wheels)
+* [#482](https://github.com/stlehmann/pyads/issues/482) Support for Python 3.13 and 3.14 is included
+
+### Changed
+* [#488](https://github.com/stlehmann/pyads/issues/488) `datetime` objects passed on by notifications now have an explicit UTC timezone, instead of `None` 
+* [#495](https://github.com/stlehmann/pyads/issues/495) Organizing of metadata in `pyproject.toml` 
+
+### Removed
+* [#488](https://github.com/stlehmann/pyads/issues/488) Removed custom `UTC` class, replaced by regular `datetime.timezone.utc`
+* Minimum Python version changed to 3.9 (Python 3.8 is no longer supported)
+
+## 3.5.1
 
 ### Added
 * [#462](https://github.com/stlehmann/pyads/issues/462) Short description on Linux build dependencies in docs
+* [#479](https://github.com/stlehmann/pyads/pull/479) Support for Beckhoff RT-Linux operating system
+* [#480](https://github.com/stlehmann/pyads/pull/480) Added NC Error codes
 
 ### Changed
 * [#400](https://github.com/stlehmann/pyads/issues/400) Full support for pyproject.toml

Dockerfile

@@ -1,14 +1,13 @@
 # This Dockerfile is for running the tests on a windows system where the
 # TwinCat router can interfere with the tests. In the first instance tests should be run with tox.
 
-ARG python_version=3.8
+ARG python_version=3.13
 
 # Build python environment and setup pyads
 FROM python:${python_version}
 COPY . /pyads
 WORKDIR /pyads
-RUN python setup.py build
-RUN python setup.py develop
+RUN python -m pip install .
 
 # Test commands
 RUN pip install pytest

README.md

@@ -37,7 +37,7 @@ From source:
 ```bash
 git clone https://github.com/stlehmann/pyads.git --recursive
 cd pyads
-python setup.py install
+pip install .
 ```
 
 ## Features

doc/installation.md

@@ -17,7 +17,7 @@ From source:
 ```bash
 git clone https://github.com/stlehmann/pyads.git --recursive
 cd pyads
-python setup.py install
+pip install .
 ```
 
 Note: pyads only supports python 3.8 and above.