From a62099c2ec9f5bb4e6ba1fce1a61bb028c3949e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 27 Jul 2025 05:35:11 +0000 Subject: [PATCH 1/4] chore: bump the actions group across 1 directory with 2 updates Bumps the actions group with 2 updates in the / directory: [conda-incubator/setup-miniconda](https://github.com/conda-incubator/setup-miniconda) and [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel). Updates `conda-incubator/setup-miniconda` from 3.0.4 to 3.2.0 - [Release notes](https://github.com/conda-incubator/setup-miniconda/releases) - [Changelog](https://github.com/conda-incubator/setup-miniconda/blob/main/CHANGELOG.md) - [Commits](https://github.com/conda-incubator/setup-miniconda/compare/v3.0.4...v3.2.0) Updates `pypa/cibuildwheel` from 2.17 to 3.1 - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.17...v3.1) --- updated-dependencies: - dependency-name: conda-incubator/setup-miniconda dependency-version: 3.2.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: pypa/cibuildwheel dependency-version: '3.1' dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions ... Signed-off-by: dependabot[bot] --- .github/workflows/conda.yml | 2 +- .github/workflows/wheels.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index e49d058..8fd3b77 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v4 - name: Get conda - uses: conda-incubator/setup-miniconda@v3.0.4 + uses: conda-incubator/setup-miniconda@v3.2.0 with: python-version: ${{ matrix.python-version }} channels: conda-forge diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 51d7228..01e6124 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -44,7 +44,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: pypa/cibuildwheel@v2.17 + - uses: pypa/cibuildwheel@v3.1 env: CIBW_ARCHS_MACOS: auto universal2 From 30e683903a15b361e638baa0a979baef4f7b9ce3 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sun, 27 Jul 2025 10:13:21 -0400 Subject: [PATCH 2/4] ci: drop conda, 3.9+ Signed-off-by: Henry Schreiner --- .github/workflows/conda.yml | 48 ------------------------------------- .github/workflows/pip.yml | 4 ++-- conda.recipe/meta.yaml | 35 --------------------------- pyproject.toml | 2 +- setup.py | 2 +- 5 files changed, 4 insertions(+), 87 deletions(-) delete mode 100644 .github/workflows/conda.yml delete mode 100644 conda.recipe/meta.yaml diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml deleted file mode 100644 index 8fd3b77..0000000 --- a/.github/workflows/conda.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Conda - -on: - workflow_dispatch: - push: - branches: - - master - pull_request: - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -jobs: - build: - strategy: - fail-fast: false - matrix: - platform: [ubuntu-latest, windows-latest, macos-12] - python-version: ["3.8", "3.10"] - - runs-on: ${{ matrix.platform }} - - # The setup-miniconda action needs this to activate miniconda - defaults: - run: - shell: "bash -l {0}" - - steps: - - uses: actions/checkout@v4 - - - name: Get conda - uses: conda-incubator/setup-miniconda@v3.2.0 - with: - python-version: ${{ matrix.python-version }} - channels: conda-forge - - - name: Prepare - run: conda install conda-build conda-verify - - - name: Build - run: conda build conda.recipe - - - name: Install - run: conda install -c ${CONDA_PREFIX}/conda-bld/ python_example - - - name: Test - run: python tests/test.py diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml index 3a0c49c..e23d3b5 100644 --- a/.github/workflows/pip.yml +++ b/.github/workflows/pip.yml @@ -16,8 +16,8 @@ jobs: strategy: fail-fast: false matrix: - platform: [windows-latest, macos-13, ubuntu-latest] - python-version: ["3.7", "3.11"] + platform: [windows-latest, macos-latest, ubuntu-latest] + python-version: ["3.9", "3.13"] runs-on: ${{ matrix.platform }} diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml deleted file mode 100644 index ce9119a..0000000 --- a/conda.recipe/meta.yaml +++ /dev/null @@ -1,35 +0,0 @@ -package: - name: python_example - version: 0.0.1 - -source: - path: .. - -build: - number: 0 - script: {{ PYTHON }} -m pip install . -vvv - -requirements: - build: - - {{ compiler('cxx') }} - - host: - - python - - pip - - pybind11 >=2.10.0 - - run: - - python - - -test: - imports: - - python_example - source_files: - - tests - commands: - - python tests/test.py - -about: - summary: An example project built with pybind11. - license_file: LICENSE diff --git a/pyproject.toml b/pyproject.toml index 2b3ce52..0c7cc8e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ test-skip = "*universal2:arm64" [tool.ruff] -target-version = "py37" +target-version = "py39" [tool.ruff.lint] extend-select = [ diff --git a/setup.py b/setup.py index 205144f..1824a0b 100644 --- a/setup.py +++ b/setup.py @@ -36,5 +36,5 @@ # level" feature, but in the future it may provide more features. cmdclass={"build_ext": build_ext}, zip_safe=False, - python_requires=">=3.7", + python_requires=">=3.9", ) From be42ef5b839919f571ce6eb507b8bcc526eb64de Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sun, 27 Jul 2025 10:25:06 -0400 Subject: [PATCH 3/4] ci: drop travis and appveyor Signed-off-by: Henry Schreiner --- .appveyor.yml | 13 ------------- .travis.yml | 36 ------------------------------------ README.md | 10 ---------- 3 files changed, 59 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .travis.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index ba6d504..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: '{build}' -image: Visual Studio 2019 -stack: python 3.7 -skip_branch_with_pr: true -init: -- cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% -install: -- ps: python -m pip install --disable-pip-version-check --upgrade --no-warn-script-location pip build virtualenv wheel -build_script: -- ps: | - python -m pip install . -test_script: -- ps: python tests\test.py diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 4cda477..0000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -language: cpp -dist: trusty -matrix: - include: - - os: linux - env: PYTHON=3.8 - - os: linux - env: CONDA=3.7 -before_install: -- | - export CXX=g++-4.8 CC=gcc-4.8 - if [ -n "$PYTHON" ]; then - python -m pip install --user virtualenv - virtualenv -p python${PYTHON:0:1} venv - source venv/bin/activate - elif [ -n "$CONDA" ]; then - wget -O miniconda.sh https://repo.continuum.io/miniconda/Miniconda${CONDA:0:1}-latest-Linux-x86_64.sh - bash miniconda.sh -b -p $HOME/miniconda - export PATH="$HOME/miniconda/bin:$PATH" - conda config --set always_yes yes --set changeps1 no - conda config --add channels conda-forge - conda update -q conda - conda install -q conda-build - conda create -q -n test-environment python=$CONDA - source activate test-environment - fi -install: -- | - if [ -n "$PYTHON" ]; then - python -m pip install . - elif [ -n "$CONDA" ]; then - conda build conda.recipe --python $CONDA - conda install --use-local python_example - fi -script: -- python tests/test.py diff --git a/README.md b/README.md index ed4c6c4..92522d6 100644 --- a/README.md +++ b/README.md @@ -5,26 +5,16 @@ python_example | CI | status | |----------------------|--------| -| Linux/macOS Travis | [![Travis-CI][travis-badge]][travis-link] | -| MSVC 2019 | [![AppVeyor][appveyor-badge]][appveyor-link] | -| conda.recipe | [![Conda Actions Status][actions-conda-badge]][actions-conda-link] | | pip builds | [![Pip Actions Status][actions-pip-badge]][actions-pip-link] | | [`cibuildwheel`][] | [![Wheels Actions Status][actions-wheels-badge]][actions-wheels-link] | [gitter-badge]: https://badges.gitter.im/pybind/Lobby.svg [gitter-link]: https://gitter.im/pybind/Lobby [actions-badge]: https://github.com/pybind/python_example/workflows/Tests/badge.svg -[actions-conda-link]: https://github.com/pybind/python_example/actions?query=workflow%3A%22Conda -[actions-conda-badge]: https://github.com/pybind/python_example/workflows/Conda/badge.svg [actions-pip-link]: https://github.com/pybind/python_example/actions?query=workflow%3A%22Pip [actions-pip-badge]: https://github.com/pybind/python_example/workflows/Pip/badge.svg [actions-wheels-link]: https://github.com/pybind/python_example/actions?query=workflow%3AWheels [actions-wheels-badge]: https://github.com/pybind/python_example/workflows/Wheels/badge.svg -[travis-link]: https://travis-ci.org/pybind/python_example -[travis-badge]: https://travis-ci.org/pybind/python_example.svg?branch=master&status=passed -[appveyor-link]: https://ci.appveyor.com/project/wjakob/python-example - -[appveyor-badge]: https://travis-ci.org/pybind/python_example.svg?branch=master&status=passed An example project built with [pybind11](https://github.com/pybind/pybind11). This requires Python 3.7+; for older versions of Python, check the commit From 8eaf3b5552ff0f45d40041c2e0ab957b92d9cc89 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Sun, 27 Jul 2025 10:27:48 -0400 Subject: [PATCH 4/4] ci: try appveyor with 3.12 Signed-off-by: Henry Schreiner --- .appveyor.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .appveyor.yml diff --git a/.appveyor.yml b/.appveyor.yml new file mode 100644 index 0000000..449bd24 --- /dev/null +++ b/.appveyor.yml @@ -0,0 +1,13 @@ +version: '{build}' +image: Visual Studio 2019 +stack: python 3.12 +skip_branch_with_pr: true +init: +- cmd: set PATH=C:\Python312;C:\Python312\Scripts;%PATH% +install: +- ps: python -m pip install --disable-pip-version-check --upgrade --no-warn-script-location pip build virtualenv wheel +build_script: +- ps: | + python -m pip install . +test_script: +- ps: python tests\test.py