From 2fc88dcc41b299626708a36844c34c27743c8b48 Mon Sep 17 00:00:00 2001 From: Maximilian Linhoff Date: Mon, 8 Jan 2024 13:02:37 +0100 Subject: [PATCH 1/3] Update CI config to include python 3.12 builds, add pytest-cov and pytest-xdist to test deps --- .github/workflows/ci.yml | 14 +++++++++----- docs/changes/2486.maintenance.rst | 1 + setup.cfg | 2 ++ 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 docs/changes/2486.maintenance.rst diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb235837d47..fde92f74d6c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,19 +43,23 @@ jobs: - os: ubuntu-latest python-version: "3.10" - install-method: mamba - extra-args: ["codecov"] + install-method: pip - os: ubuntu-latest python-version: "3.11" install-method: mamba - os: ubuntu-latest - python-version: "3.11" + python-version: "3.12" + install-method: mamba + extra-args: ["codecov"] + + - os: ubuntu-latest + python-version: "3.12" install-method: pip - os: macos-latest - python-version: "3.11" + python-version: "3.12" install-method: mamba - os: macos-latest @@ -116,10 +120,10 @@ jobs: PYTHON_VERSION: ${{ matrix.python-version }} run: | python --version | grep "Python ${PYTHON_VERSION}" - pip install pytest-cov pytest-xdist 'coverage!=6.3.0' pip install -e .[all] pip install ./test_plugin pip freeze + pip list - name: ctapipe-info if: contains(github.event.pull_request.labels.*.name, 'documentation-only') == false diff --git a/docs/changes/2486.maintenance.rst b/docs/changes/2486.maintenance.rst new file mode 100644 index 00000000000..d1ba7bf9e6e --- /dev/null +++ b/docs/changes/2486.maintenance.rst @@ -0,0 +1 @@ +Support and test on python 3.12. diff --git a/setup.cfg b/setup.cfg index 0bff10983e2..69f2268bc42 100644 --- a/setup.cfg +++ b/setup.cfg @@ -50,6 +50,8 @@ install_requires= [options.extras_require] tests = pytest >= 7.0 + pytest-cov + pytest-xdist pandas ~=1.0 tomli pytest_astropy_header From bf7ab13b996dd2e937d67fc5178b601aea396e4f Mon Sep 17 00:00:00 2001 From: Maximilian Linhoff Date: Wed, 7 Feb 2024 11:10:44 +0100 Subject: [PATCH 2/3] Remove pandas pin for tests --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 69f2268bc42..952a64b0239 100644 --- a/setup.cfg +++ b/setup.cfg @@ -52,7 +52,7 @@ tests = pytest >= 7.0 pytest-cov pytest-xdist - pandas ~=1.0 + pandas tomli pytest_astropy_header h5py From e1c77138b075545dd36871515365941a95d1d012 Mon Sep 17 00:00:00 2001 From: Maximilian Linhoff Date: Wed, 7 Feb 2024 11:15:35 +0100 Subject: [PATCH 3/3] Only install tests extra in test CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fde92f74d6c..437d74b7b7a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,7 +120,7 @@ jobs: PYTHON_VERSION: ${{ matrix.python-version }} run: | python --version | grep "Python ${PYTHON_VERSION}" - pip install -e .[all] + pip install -e .[tests] pip install ./test_plugin pip freeze pip list