From 788249b2ee9bd78f73f13a0d0f4899e6918abf1e Mon Sep 17 00:00:00 2001 From: pveigadecamargo Date: Mon, 9 Oct 2023 17:10:55 +1000 Subject: [PATCH 1/4] Adds support for Python 3.12 --- .github/workflows/build_linux.yml | 4 ++-- .github/workflows/build_mac.yml | 4 ++-- .github/workflows/build_windows.yml | 2 +- .github/workflows/unit_tests.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index ec1617d69..9043a3d60 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -21,7 +21,7 @@ jobs: - name: Build manylinux Python wheels uses: RalfG/python-wheels-manylinux-build@v0.7.1 with: - python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311' + python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312' pip-wheel-args: '--no-deps' - name: Moves wheels @@ -38,7 +38,7 @@ jobs: - name: Build manylinux Python wheels uses: RalfG/python-wheels-manylinux-build@v0.7.1 with: - python-versions: 'cp38-cp38 cp39-cp39 cp310-cp310' + python-versions: 'cp39-cp39' pip-wheel-args: '--no-deps' - name: Moves wheels diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml index a870d232b..196fde2da 100644 --- a/.github/workflows/build_mac.yml +++ b/.github/workflows/build_mac.yml @@ -14,7 +14,7 @@ jobs: continue-on-error: true strategy: matrix: - python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v3 @@ -51,7 +51,7 @@ jobs: twine upload dist/*.whl - name: Publish tar files - if: ${{ (github.event_name == 'release') && (env.HAS_SECRETS == 'true') && (matrix.python-version == '3.9') }} + if: ${{ (github.event_name == 'release') && (env.HAS_SECRETS == 'true') && (matrix.python-version == '3.11') }} env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml index e85b9dcc5..35858c8f9 100644 --- a/.github/workflows/build_windows.yml +++ b/.github/workflows/build_windows.yml @@ -10,7 +10,7 @@ jobs: continue-on-error: true strategy: matrix: - python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] architecture: ['x64'] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 61a3d2b16..94ce20b8b 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -31,7 +31,7 @@ jobs: runs-on: ${{ matrix.os}} strategy: matrix: - python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11'] + python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] os: [windows-latest, ubuntu-latest] max-parallel: 20 From a6242fb4352a57660d0ab17b9911df92b293d054 Mon Sep 17 00:00:00 2001 From: Pedro Camargo Date: Mon, 13 Nov 2023 16:43:10 +1000 Subject: [PATCH 2/4] Update build_mac.yml --- .github/workflows/build_mac.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml index 196fde2da..5c2fc10cb 100644 --- a/.github/workflows/build_mac.yml +++ b/.github/workflows/build_mac.yml @@ -15,7 +15,6 @@ jobs: strategy: matrix: python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12'] - steps: - uses: actions/checkout@v3 - name: Set Python environment @@ -55,4 +54,4 @@ jobs: env: TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: twine upload dist/*.gz \ No newline at end of file + run: twine upload dist/*.gz From 0cc2a01073af38f780d37e6d8ed009d972b72cb0 Mon Sep 17 00:00:00 2001 From: Jake-Moss Date: Tue, 14 Nov 2023 14:01:22 +1000 Subject: [PATCH 3/4] Move from depreciated `license_file` as its now a build error --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 73a44e95c..eb3eee575 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,4 +2,4 @@ universal = 1 [metadata] -license_file = LICENSE.TXT \ No newline at end of file +license_files = [LICENSE.TXT] \ No newline at end of file From 74a73edf1dc116103b8ae98d425871aac2243230 Mon Sep 17 00:00:00 2001 From: Jake-Moss Date: Tue, 14 Nov 2023 14:02:28 +1000 Subject: [PATCH 4/4] `assertEquals` is a deprecated alias for `assertEqual` --- tests/aequilibrae/paths/test_select_link.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/aequilibrae/paths/test_select_link.py b/tests/aequilibrae/paths/test_select_link.py index e34b09dde..a8f89f02d 100644 --- a/tests/aequilibrae/paths/test_select_link.py +++ b/tests/aequilibrae/paths/test_select_link.py @@ -138,7 +138,7 @@ def test_duplicate_links(self): self.assignment = TrafficAssignment() self.assignclass = TrafficClass("car", self.car_graph, self.matrix) self.assignclass.set_select_links({"test": [(1, 1), (1, 1)]}) - self.assertEquals(len(self.assignclass._selected_links["test"]), 1, "Did not correctly remove duplicate link") + self.assertEqual(len(self.assignclass._selected_links["test"]), 1, "Did not correctly remove duplicate link") def test_link_out_of_bounds(self): """