From 0623e15f389ff308bd8bd9e8ef94a981dbbf4c85 Mon Sep 17 00:00:00 2001 From: "Benjamin T. Vincent" Date: Wed, 5 Jun 2024 10:59:37 +0100 Subject: [PATCH 1/8] add python version 3.12 to remote tests --- .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 31f03f8c..6ae80eac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.10", "3.11"] + python-version: ["3.10", "3.11", "3.12"] steps: - uses: actions/checkout@v3 From 51a06160685855b66c474ebe3cae6c55fe9ec612 Mon Sep 17 00:00:00 2001 From: "Benjamin T. Vincent" Date: Wed, 5 Jun 2024 11:12:02 +0100 Subject: [PATCH 2/8] install setuptools to ensure we aren't missing distutils --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ae80eac..a6df45f9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,10 @@ jobs: uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} + - name: Install setuptools + run: | + python -m ensurepip + pip install --upgrade pip setuptools - name: Run doctests run: | pip install -e .[test] From c8aa2c683683318da5c5d589f2bfeb8d1eae71b8 Mon Sep 17 00:00:00 2001 From: "Benjamin T. Vincent" Date: Wed, 5 Jun 2024 11:34:40 +0100 Subject: [PATCH 3/8] attempt to fix --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a6df45f9..0bc0334f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,10 +19,10 @@ jobs: uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - name: Install setuptools + - name: Install dependencies run: | python -m ensurepip - pip install --upgrade pip setuptools + pip install --upgrade pip setuptools wheel - name: Run doctests run: | pip install -e .[test] From e9a7d6ca384764cf1f882e7afa22624f5229b24e Mon Sep 17 00:00:00 2001 From: "Benjamin T. Vincent" Date: Wed, 5 Jun 2024 11:37:32 +0100 Subject: [PATCH 4/8] another fix attempt --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0bc0334f..2adb3e0b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,8 @@ jobs: - name: Install dependencies run: | python -m ensurepip - pip install --upgrade pip setuptools wheel + pip install --upgrade pip + pip install setuptools==65.5.0 wheel - name: Run doctests run: | pip install -e .[test] From 1b09293beb1adcebc37e0102ab0c01baf2de72d9 Mon Sep 17 00:00:00 2001 From: "Benjamin T. Vincent" Date: Wed, 5 Jun 2024 11:50:17 +0100 Subject: [PATCH 5/8] add python version specific optional test dependencies --- .github/workflows/ci.yml | 5 ----- pyproject.toml | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2adb3e0b..6ae80eac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,11 +19,6 @@ jobs: uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m ensurepip - pip install --upgrade pip - pip install setuptools==65.5.0 wheel - name: Run doctests run: | pip install -e .[test] diff --git a/pyproject.toml b/pyproject.toml index ca9c95e9..977955a3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,7 +65,12 @@ docs = [ "sphinxcontrib-bibtex", ] lint = ["interrogate", "nbqa", "pre-commit", "ruff"] -test = ["pytest", "pytest-cov"] +test = [ + "pytest", + "pytest-cov", + "setuptools>=65.5.0; python_version >= '3.12'", + "wheel; python_version >= '3.12'", +] [metadata] description-file = 'README.md' From fe330462a3711e7537db0b0c1c64cf24923484dc Mon Sep 17 00:00:00 2001 From: "Benjamin T. Vincent" Date: Wed, 5 Jun 2024 12:24:50 +0100 Subject: [PATCH 6/8] update github action versions, revert adding extra dependencies --- .github/workflows/ci.yml | 4 ++-- .github/workflows/release.yml | 6 +++--- pyproject.toml | 7 +------ 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ae80eac..d7969bfc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,9 +14,9 @@ jobs: python-version: ["3.10", "3.11", "3.12"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Run doctests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5feb538a..412d20b2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,10 +12,10 @@ jobs: name: Build source distribution runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.11 - name: Build the sdist and the wheel @@ -60,7 +60,7 @@ jobs: user: __token__ password: ${{ secrets.TEST_PYPI_API_TOKEN }} repository_url: https://test.pypi.org/legacy/ - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: 3.11 - name: Test pip install from test.pypi diff --git a/pyproject.toml b/pyproject.toml index 977955a3..ca9c95e9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -65,12 +65,7 @@ docs = [ "sphinxcontrib-bibtex", ] lint = ["interrogate", "nbqa", "pre-commit", "ruff"] -test = [ - "pytest", - "pytest-cov", - "setuptools>=65.5.0; python_version >= '3.12'", - "wheel; python_version >= '3.12'", -] +test = ["pytest", "pytest-cov"] [metadata] description-file = 'README.md' From 8acfb11e0f4a50a86bb0cd7529413c9dd4767ebd Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Wed, 5 Jun 2024 13:49:26 +0200 Subject: [PATCH 7/8] Update ci.yml --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7969bfc..2ac257b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} + - name: Update pip and setuptools + run: pip install --upgrade pip setuptools - name: Run doctests run: | pip install -e .[test] From e00c2c82584e04e43cc71945ab309f1ad1ab2778 Mon Sep 17 00:00:00 2001 From: Ben Mares Date: Wed, 5 Jun 2024 13:53:34 +0200 Subject: [PATCH 8/8] Remove numpy pin --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ca9c95e9..9e63c32a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -31,7 +31,7 @@ dependencies = [ "graphviz", "ipython!=8.7.0", "matplotlib>=3.5.3", - "numpy<1.26.0", + "numpy", "pandas", "patsy", "pymc>=5.14.0",