From 5d39b99e3e4ae59bb88d85f486816a4acb1e788c Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Tue, 9 Sep 2025 10:55:34 -0500 Subject: [PATCH 1/7] Remove obsolete 'not_branches' setting from gps-raspbian --- master/custom/workers.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/master/custom/workers.py b/master/custom/workers.py index ef952c18..b058aa70 100644 --- a/master/custom/workers.py +++ b/master/custom/workers.py @@ -182,8 +182,6 @@ def get_workers(settings): tags=['linux', 'unix', 'raspbian', 'debian', 'armv6', 'armv7l', 'aarch32', 'arm'], parallel_tests=4, - # Raspbian Debian bullseye ships with 3.9, bookworm with 3.11. - not_branches=['3.7', '3.8'], ), cpw( name="stan-raspbian", From 50ca630f7862ab1593ebf44abe4ce51ab6c44761 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Tue, 9 Sep 2025 17:55:09 -0500 Subject: [PATCH 2/7] Include PYTHON_VERSION in requirements filename --- Makefile | 7 +++-- requirements.txt => requirements-3.9.txt | 39 ++++++++++++------------ 2 files changed, 24 insertions(+), 22 deletions(-) rename requirements.txt => requirements-3.9.txt (66%) diff --git a/Makefile b/Makefile index fff644d1..dc0b443d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ PYTHON_VERSION=3.9 SYSTEM_PYTHON=python$(PYTHON_VERSION) VENV_DIR=./venv +REQUIREMENTS=requirements-$(PYTHON_VERSION).txt PIP=$(VENV_DIR)/bin/pip # make stop-server kills all processes named "python" PKILL_NAME="python" @@ -18,16 +19,16 @@ venv: $(VENV_CHECK) clean: rm -rf venv -$(VENV_CHECK): requirements.txt +$(VENV_CHECK): $(REQUIREMENTS) $(SYSTEM_PYTHON) -m venv --clear venv $(PIP) install -U pip - $(PIP) install -r requirements.txt + $(PIP) install -r $(REQUIREMENTS) regen-requirements: $(SYSTEM_PYTHON) -m venv --clear venv $(PIP) install -U pip $(PIP) install -U -r requirements.in - $(PIP) freeze > requirements.txt + $(PIP) freeze > $(REQUIREMENTS) # Test targets diff --git a/requirements.txt b/requirements-3.9.txt similarity index 66% rename from requirements.txt rename to requirements-3.9.txt index e8c377a3..dd84e9dc 100644 --- a/requirements.txt +++ b/requirements-3.9.txt @@ -1,4 +1,4 @@ -alembic==1.15.2 +alembic==1.16.5 attrs==25.3.0 autobahn==24.4.2 Automat==25.4.16 @@ -10,16 +10,16 @@ buildbot-waterfall-view==4.3.0 buildbot-worker==4.3.0 buildbot-wsgi-dashboards==4.3.0 buildbot-www==4.3.0 -certifi==2025.4.26 -cffi==1.17.1 -charset-normalizer==3.4.2 +certifi==2025.8.3 +cffi==2.0.0 +charset-normalizer==3.4.3 click==8.1.8 constantly==23.10.4 croniter==6.0.0 -cryptography==45.0.2 -Flask==3.1.1 -greenlet==3.2.2 -humanize==4.12.3 +cryptography==45.0.7 +Flask==3.1.2 +greenlet==3.2.4 +humanize==4.13.0 hyperlink==21.0.0 idna==3.10 importlib_metadata==8.7.0 @@ -28,29 +28,30 @@ itsdangerous==2.2.0 Jinja2==3.1.6 Mako==1.3.10 MarkupSafe==3.0.2 -msgpack==1.1.0 +msgpack==1.1.1 +multipart==1.3.0 packaging==25.0 psycopg2==2.9.10 pyasn1==0.6.1 pyasn1_modules==0.4.2 -pycparser==2.22 +pycparser==2.23 PyJWT==2.10.1 pyOpenSSL==25.1.0 python-dateutil==2.9.0.post0 pytz==2025.2 PyYAML==6.0.2 -requests==2.32.3 -sentry-sdk==2.28.0 +requests==2.32.5 +sentry-sdk==2.37.1 service-identity==24.2.0 six==1.17.0 -SQLAlchemy==2.0.41 +SQLAlchemy==2.0.43 tomli==2.2.1 -treq==24.9.1 -Twisted==24.11.0 -txaio==23.1.1 -typing_extensions==4.13.2 +treq==25.5.0 +Twisted==25.5.0 +txaio==23.6.1 +typing_extensions==4.15.0 unidiff==0.7.5 -urllib3==2.4.0 +urllib3==2.5.0 Werkzeug==3.1.3 -zipp==3.21.0 +zipp==3.23.0 zope.interface==7.2 From 9462a0b64b5e3764504e2ee7a4bdbcbb1d983fcb Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Tue, 9 Sep 2025 21:55:03 -0500 Subject: [PATCH 3/7] Add requirements for 3.13 --- requirements-3.13.txt | 55 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 requirements-3.13.txt diff --git a/requirements-3.13.txt b/requirements-3.13.txt new file mode 100644 index 00000000..eee6b622 --- /dev/null +++ b/requirements-3.13.txt @@ -0,0 +1,55 @@ +alembic==1.16.5 +attrs==25.3.0 +autobahn==24.4.2 +Automat==25.4.16 +blinker==1.9.0 +buildbot==4.3.0 +buildbot-console-view==4.3.0 +buildbot-grid-view==4.3.0 +buildbot-waterfall-view==4.3.0 +buildbot-worker==4.3.0 +buildbot-wsgi-dashboards==4.3.0 +buildbot-www==4.3.0 +certifi==2025.8.3 +cffi==2.0.0 +charset-normalizer==3.4.3 +click==8.2.1 +constantly==23.10.4 +croniter==6.0.0 +cryptography==45.0.7 +Flask==3.1.2 +greenlet==3.2.4 +humanize==4.13.0 +hyperlink==21.0.0 +idna==3.10 +incremental==24.7.2 +itsdangerous==2.2.0 +Jinja2==3.1.6 +Mako==1.3.10 +MarkupSafe==3.0.2 +msgpack==1.1.1 +multipart==1.3.0 +packaging==25.0 +psycopg2==2.9.10 +pyasn1==0.6.1 +pyasn1_modules==0.4.2 +pycparser==2.23 +PyJWT==2.10.1 +pyOpenSSL==25.1.0 +python-dateutil==2.9.0.post0 +pytz==2025.2 +PyYAML==6.0.2 +requests==2.32.5 +sentry-sdk==2.37.1 +service-identity==24.2.0 +setuptools==80.9.0 +six==1.17.0 +SQLAlchemy==2.0.43 +treq==25.5.0 +Twisted==25.5.0 +txaio==25.6.1 +typing_extensions==4.15.0 +unidiff==0.7.5 +urllib3==2.5.0 +Werkzeug==3.1.3 +zope.interface==7.2 From bfcf0f6d60012eb68c33c314428b301891526525 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Tue, 9 Sep 2025 21:58:13 -0500 Subject: [PATCH 4/7] Run GHA on both 3.9 and 3.13 --- .github/workflows/build.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57a0ca74..e1f89dcd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,6 +10,11 @@ env: jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + python-version: + - '3.9' + - '3.13' steps: - uses: actions/checkout@v4 with: @@ -17,6 +22,6 @@ jobs: - name: Setup Python uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: ${{ matrix.python-version }} - name: Check configuration - run: make check PIP=pip BUILDBOT=buildbot + run: make check PIP=pip BUILDBOT=buildbot PYTHON_VERSION=${{ matrix.python-version }} From 3e9cd1db08e65c23024d87fe19aa5989c696cf93 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Wed, 10 Sep 2025 07:38:49 -0500 Subject: [PATCH 5/7] Add fail-fast: false Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1f89dcd..be803773 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,7 @@ jobs: build: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: python-version: - '3.9' From e63eea42b9b201d51efd6daa91c9794774848c19 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Wed, 10 Sep 2025 08:35:55 -0500 Subject: [PATCH 6/7] Add explanatory comment on fail-fast setting --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index be803773..c3ace81c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,6 +11,7 @@ jobs: build: runs-on: ubuntu-latest strategy: + # These are short jobs, fail-fast would only hide information from us fail-fast: false matrix: python-version: From 8280dc79b724499f08d162ad350aacefa7fb6ddb Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Wed, 10 Sep 2025 08:36:27 -0500 Subject: [PATCH 7/7] Name the workflow better --- .github/workflows/{build.yml => check.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{build.yml => check.yml} (95%) diff --git a/.github/workflows/build.yml b/.github/workflows/check.yml similarity index 95% rename from .github/workflows/build.yml rename to .github/workflows/check.yml index c3ace81c..ad9f7ff2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/check.yml @@ -1,4 +1,4 @@ -name: Build +name: Check config on: [push, pull_request, workflow_dispatch] @@ -8,7 +8,7 @@ env: FORCE_COLOR: 1 jobs: - build: + check-config: runs-on: ubuntu-latest strategy: # These are short jobs, fail-fast would only hide information from us