From dcdac7e58e301bc815721bbe556ec8c5391b2e80 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Tue, 10 Mar 2026 19:34:20 -0600 Subject: [PATCH 1/6] mark docs as outdated --- docs/conf.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index bcf72e864..506376660 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,7 +57,7 @@ def nothing(*arg): 'sphinxcontrib.autoprogram', 'sphinx_copybutton', # enable pylons_sphinx_latesturl when this branch is no longer "latest" - # 'pylons_sphinx_latesturl', + 'pylons_sphinx_latesturl', ] # Looks for objects in external projects @@ -127,26 +127,26 @@ def nothing(*arg): # Options for HTML output # ----------------------- # enable pylons_sphinx_latesturl when this branch is no longer "latest" -# pylons_sphinx_latesturl_base = ( -# 'https://docs.pylonsproject.org/projects/pyramid/en/latest/') -# pylons_sphinx_latesturl_pagename_overrides = { -# # map old pagename -> new pagename -# 'whatsnew-1.0': 'index', -# 'whatsnew-1.1': 'index', -# 'whatsnew-1.2': 'index', -# 'whatsnew-1.3': 'index', -# 'whatsnew-1.4': 'index', -# 'whatsnew-1.5': 'index', -# 'whatsnew-1.6': 'index', -# 'whatsnew-1.7': 'index', -# 'whatsnew-1.8': 'index', -# 'whatsnew-1.9': 'index', -# 'whatsnew-1.10': 'index', -# 'whatsnew-2.0': 'index', -# 'tutorials/gae/index': 'index', -# 'api/chameleon_text': 'api', -# 'api/chameleon_zpt': 'api', -# } +pylons_sphinx_latesturl_base = ( + 'https://docs.pylonsproject.org/projects/pyramid/en/latest/') +pylons_sphinx_latesturl_pagename_overrides = { + # map old pagename -> new pagename + 'whatsnew-1.0': 'index', + 'whatsnew-1.1': 'index', + 'whatsnew-1.2': 'index', + 'whatsnew-1.3': 'index', + 'whatsnew-1.4': 'index', + 'whatsnew-1.5': 'index', + 'whatsnew-1.6': 'index', + 'whatsnew-1.7': 'index', + 'whatsnew-1.8': 'index', + 'whatsnew-1.9': 'index', + 'whatsnew-1.10': 'index', + 'whatsnew-2.0': 'index', + 'tutorials/gae/index': 'index', + 'api/chameleon_text': 'api', + 'api/chameleon_zpt': 'api', +} html_theme = 'pyramid' html_theme_path = pylons_sphinx_themes.get_html_themes_path() @@ -156,7 +156,7 @@ def nothing(*arg): # pre-release status: true; else: false. in_progress='false', # On branches previous to "latest": true; else: false. - outdated='false', + outdated='true', ) # Control display of sidebars From 05d6159a12fbafb508caa0e396b427aea8508e7a Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 11 Mar 2026 11:33:29 -0600 Subject: [PATCH 2/6] port cicd changes from main to 2.0-branch --- .github/workflows/ci-tests.yml | 87 +++++++++++++++------------------- .readthedocs.yaml | 2 +- 2 files changed, 38 insertions(+), 51 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 47570dc6b..1cfcb212e 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -7,12 +7,14 @@ on: - main - "[0-9].[0-9]+-branch" tags: + - "*" # Build pull requests pull_request: jobs: test: strategy: + # See https://github.com/actions/runner-images matrix: py: - "3.6" @@ -23,76 +25,61 @@ jobs: - "3.11" - "pypy-3.8" os: - - "ubuntu-20.04" - - "windows-2022" - - "macos-11" - architecture: - - x64 - - x86 - + - "ubuntu-24.04" # x64 + - "windows-2022" # x64 + - "macos-15" # arm64 + - "macos-15-intel" # x64 include: - # Only run coverage on ubuntu-20.04, except on pypy3 - - os: "ubuntu-20.04" + - os: "ubuntu-24.04" pytest-args: "--cov" - - os: "ubuntu-20.04" - py: "pypy-3.8" + - py: "pypy-3.8" + toxenv: "pypy38" pytest-args: "" - exclude: - # Linux and macOS don't have x86 python - - os: "ubuntu-20.04" - architecture: x86 - - os: "macos-11" - architecture: x86 - # PyPy3 on Windows doesn't seem to work - - os: "windows-2022" - py: "pypy-3.8" - - name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}" + name: "Python: ${{ matrix.py }} on ${{ matrix.os }}" runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v3 - - name: Setup python - uses: actions/setup-python@v4 + - uses: actions/checkout@v6 + - name: Setup uv + uses: astral-sh/setup-uv@v7 with: python-version: ${{ matrix.py }} - architecture: ${{ matrix.architecture }} - - run: pip install tox - - name: Running tox - run: tox -e py -- ${{ matrix.pytest-args }} + - name: Running tox with specific toxenv + if: ${{ matrix.toxenv != '' }} + env: + TOXENV: ${{ matrix.toxenv }} + run: uvx tox + - name: Running tox for current python version + if: ${{ matrix.toxenv == '' }} + run: uvx tox -e py -- ${{ matrix.pytest-args }} + coverage: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Validate coverage steps: - - uses: actions/checkout@v3 - - name: Setup python - uses: actions/setup-python@v4 + - uses: actions/checkout@v6 + - name: Setup uv + uses: astral-sh/setup-uv@v7 with: python-version: "3.8" - architecture: x64 - - run: pip install tox - - run: tox -e py38-cover,coverage + - run: uvx tox -e py38-cover,coverage docs: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Build the documentation steps: - - uses: actions/checkout@v3 - - name: Setup python - uses: actions/setup-python@v4 + - uses: actions/checkout@v6 + - name: Setup uv + uses: astral-sh/setup-uv@v7 with: python-version: "3.8" - architecture: x64 - - run: pip install tox - - run: tox -e docs + - run: uvx tox -e docs lint: - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 name: Lint the package steps: - - uses: actions/checkout@v3 - - name: Setup python - uses: actions/setup-python@v4 + - uses: actions/checkout@v6 + - name: Setup uv + uses: astral-sh/setup-uv@v7 with: python-version: "3.8" - architecture: x64 - - run: pip install tox - - run: tox -e lint + - run: uvx tox -e lint diff --git a/.readthedocs.yaml b/.readthedocs.yaml index d45905a5d..e44650bca 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -3,7 +3,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: '3.11' + python: '3.8' sphinx: configuration: docs/conf.py formats: From 8c1dba2362c9084e7840ade52d4050b8bea03d72 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 11 Mar 2026 11:37:21 -0600 Subject: [PATCH 3/6] do not fail fast --- .github/workflows/ci-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 1cfcb212e..e374f31a5 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -14,6 +14,7 @@ on: jobs: test: strategy: + fail-fast: false # See https://github.com/actions/runner-images matrix: py: From 916881b1c65158a3ec5fdeb2c75acd981452c5cb Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 11 Mar 2026 11:40:16 -0600 Subject: [PATCH 4/6] try the original cicd config --- .github/workflows/ci-tests.yml | 87 +++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index e374f31a5..8c67d7894 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -14,8 +14,6 @@ on: jobs: test: strategy: - fail-fast: false - # See https://github.com/actions/runner-images matrix: py: - "3.6" @@ -26,61 +24,76 @@ jobs: - "3.11" - "pypy-3.8" os: - - "ubuntu-24.04" # x64 - - "windows-2022" # x64 - - "macos-15" # arm64 - - "macos-15-intel" # x64 + - "ubuntu-20.04" + - "windows-2022" + - "macos-11" + architecture: + - x64 + - x86 + include: - - os: "ubuntu-24.04" + # Only run coverage on ubuntu-20.04, except on pypy3 + - os: "ubuntu-20.04" pytest-args: "--cov" - - py: "pypy-3.8" - toxenv: "pypy38" + - os: "ubuntu-20.04" + py: "pypy-3.8" pytest-args: "" - name: "Python: ${{ matrix.py }} on ${{ matrix.os }}" + exclude: + # Linux and macOS don't have x86 python + - os: "ubuntu-20.04" + architecture: x86 + - os: "macos-11" + architecture: x86 + # PyPy3 on Windows doesn't seem to work + - os: "windows-2022" + py: "pypy-3.8" + + name: "Python: ${{ matrix.py }}-${{ matrix.architecture }} on ${{ matrix.os }}" runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v6 - - name: Setup uv - uses: astral-sh/setup-uv@v7 + - uses: actions/checkout@v3 + - name: Setup python + uses: actions/setup-python@v4 with: python-version: ${{ matrix.py }} - - name: Running tox with specific toxenv - if: ${{ matrix.toxenv != '' }} - env: - TOXENV: ${{ matrix.toxenv }} - run: uvx tox - - name: Running tox for current python version - if: ${{ matrix.toxenv == '' }} - run: uvx tox -e py -- ${{ matrix.pytest-args }} - + architecture: ${{ matrix.architecture }} + - run: pip install tox + - name: Running tox + run: tox -e py -- ${{ matrix.pytest-args }} coverage: - runs-on: ubuntu-24.04 + runs-on: ubuntu-20.04 name: Validate coverage steps: - - uses: actions/checkout@v6 - - name: Setup uv - uses: astral-sh/setup-uv@v7 + - uses: actions/checkout@v3 + - name: Setup python + uses: actions/setup-python@v4 with: python-version: "3.8" - - run: uvx tox -e py38-cover,coverage + architecture: x64 + - run: pip install tox + - run: tox -e py38-cover,coverage docs: - runs-on: ubuntu-24.04 + runs-on: ubuntu-20.04 name: Build the documentation steps: - - uses: actions/checkout@v6 - - name: Setup uv - uses: astral-sh/setup-uv@v7 + - uses: actions/checkout@v3 + - name: Setup python + uses: actions/setup-python@v4 with: python-version: "3.8" - - run: uvx tox -e docs + architecture: x64 + - run: pip install tox + - run: tox -e docs lint: - runs-on: ubuntu-24.04 + runs-on: ubuntu-20.04 name: Lint the package steps: - - uses: actions/checkout@v6 - - name: Setup uv - uses: astral-sh/setup-uv@v7 + - uses: actions/checkout@v3 + - name: Setup python + uses: actions/setup-python@v4 with: python-version: "3.8" - - run: uvx tox -e lint + architecture: x64 + - run: pip install tox + - run: tox -e lint From 2a81aefeb410b57612a223d25e7dfede3965fb6c Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 11 Mar 2026 11:41:43 -0600 Subject: [PATCH 5/6] do not fail fast --- .github/workflows/ci-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 8c67d7894..a97657e77 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -14,6 +14,7 @@ on: jobs: test: strategy: + fail-fast: false matrix: py: - "3.6" From 415ffa5619708da951ed42fe71fc343fbfabb494 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 11 Mar 2026 11:44:29 -0600 Subject: [PATCH 6/6] constraint setuptools in tests --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index c7cade0fc..3e5cf9c4a 100644 --- a/setup.py +++ b/setup.py @@ -55,6 +55,7 @@ def readfile(name): 'coverage', 'pytest>=5.4.2', # unittest.TestCase funkyness, see commit 77c1505ab 'pytest-cov', + 'setuptools < 82', # require pkg_resources ] branch_version = ".".join(VERSION.split(".")[:2])