From 2fc4eef19f3ac113eb2f8b0163f2c4c8438464c5 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Fri, 12 Dec 2025 13:57:54 +0000 Subject: [PATCH 1/4] Install package with `pip` in CI --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 67563e5..033d9a5 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -28,7 +28,7 @@ jobs: - name: Install package run: | - python setup.py install + pip install . - name: Run tests run: nosetests --exe From a933b09ad261a0fe5401cc4b1237f382ae979960 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Fri, 12 Dec 2025 14:02:32 +0000 Subject: [PATCH 2/4] Update to Python 3.10 --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 033d9a5..4006a52 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: ['3.9'] + python: ['3.10'] steps: - name: Checkout code From ee4e947458be3547589c5015a887edd5c612ccb0 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Fri, 12 Dec 2025 14:21:55 +0000 Subject: [PATCH 3/4] Use pynose For Python 3.10+ compatibility. If we switch to pytest, there are issues with test ordering and/or persistent state which appear, so we should fix that, but later. --- .github/workflows/ci-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 4006a52..fe08c20 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -24,7 +24,7 @@ jobs: - name: Install extra packages for tests run: | - pip install wheel nose lxml + pip install wheel pynose lxml - name: Install package run: | From 96e02607fc0e0c68d02d6f80eb7f92225e6b6b14 Mon Sep 17 00:00:00 2001 From: Steven Maude Date: Fri, 12 Dec 2025 14:17:46 +0000 Subject: [PATCH 4/4] Fix imports for Python 3.10 --- scraperwiki/sql.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scraperwiki/sql.py b/scraperwiki/sql.py index 138fdea..62aa149 100644 --- a/scraperwiki/sql.py +++ b/scraperwiki/sql.py @@ -1,5 +1,6 @@ from __future__ import absolute_import, print_function -from collections import Iterable, Mapping, OrderedDict +from collections import OrderedDict +from collections.abc import Iterable, Mapping import atexit import datetime