From 4b85586cf4bb17782c8c06301b61a33d1c6e1d75 Mon Sep 17 00:00:00 2001 From: John Whittington Date: Mon, 17 Mar 2025 07:19:44 +0100 Subject: [PATCH 1/2] specify packages.find include #114 --- .github/workflows/build.yml | 2 +- openant/__init__.py | 2 +- pyproject.toml | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5d28d33..5a2bd97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] steps: - uses: actions/checkout@v3 diff --git a/openant/__init__.py b/openant/__init__.py index 0350378..7605fef 100644 --- a/openant/__init__.py +++ b/openant/__init__.py @@ -31,7 +31,7 @@ from . import devices __all__ = ["base", "easy", "fs", "devices"] -__version__ = "1.3.2" +__version__ = "1.3.3" # subparser importer taken from cantools module diff --git a/pyproject.toml b/pyproject.toml index ac07e50..fe8172b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,8 +37,9 @@ docs = ["sphinx>=5.2.3", "furo>=2021.3.20b30", "sphinx_mdinclude"] [project.scripts] openant = "openant.__init__:_main" -[tool.setuptools] -packages = ["openant"] +# specify to avoid symbolic link ant +[tool.setuptools.packages.find] +include = ["openant*"] [tool.setuptools.dynamic] readme = { file = "README.md" } From f2a2c8789e42587367102c2648f5f087c94e538c Mon Sep 17 00:00:00 2001 From: John Whittington Date: Mon, 17 Mar 2025 07:32:27 +0100 Subject: [PATCH 2/2] fix action versions out of date --- .github/workflows/build.yml | 18 +++++++++--------- .github/workflows/format.yml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a2bd97..7a19827 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,9 +16,9 @@ jobs: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' @@ -32,9 +32,9 @@ jobs: docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.12" - name: Install dependencies @@ -43,7 +43,7 @@ jobs: run: | cd docs make html - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: sphinx-out path: ./docs/_build/ @@ -52,9 +52,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.12" - name: Build wheel and sdist @@ -69,9 +69,9 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python 3.12 - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.12" - name: Install pypa/build diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 119568a..71ffd3b 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -12,7 +12,7 @@ jobs: black: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Test if requires format with Black uses: psf/black@stable with: