From 90fe5cb79cd8dc8978db0754d34cd66e818e8f05 Mon Sep 17 00:00:00 2001 From: shimwell Date: Tue, 4 Oct 2022 21:00:17 +0100 Subject: [PATCH 1/2] added py3.9 and py3.10 --- .github/workflows/ci.yml | 8 +++++++- setup.py | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 050c8e287b..a165998d4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,6 +60,12 @@ jobs: python-version: 3.8 omp: n mpi: y + - python-version: 3.9 + omp: n + mpi: n + - python-version: '3.10' + omp: n + mpi: n name: "Python ${{ matrix.python-version }} (omp=${{ matrix.omp }}, mpi=${{ matrix.mpi }}, dagmc=${{ matrix.dagmc }}, libmesh=${{ matrix.libmesh }}, event=${{ matrix.event }} @@ -78,7 +84,7 @@ jobs: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} diff --git a/setup.py b/setup.py index 477f29dec9..43b5159345 100755 --- a/setup.py +++ b/setup.py @@ -61,6 +61,7 @@ kwargs = { 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Programming Language :: Python :: 3.10', ], # Dependencies From de636b42a91c330311cc1474673f7fca5d8f3b42 Mon Sep 17 00:00:00 2001 From: shimwell Date: Sun, 16 Oct 2022 13:14:46 +0100 Subject: [PATCH 2/2] py3.10 as main build matrix --- .github/workflows/ci.yml | 47 +++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a165998d4e..e267c0d8e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: runs-on: ubuntu-20.04 strategy: matrix: - python-version: [3.8] + python-version: ['3.10'] mpi: [n, y] omp: [n, y] dagmc: [n] @@ -34,38 +34,35 @@ jobs: vectfit: [n] include: - - python-version: 3.6 - omp: n - mpi: n - python-version: 3.7 omp: n mpi: n - - dagmc: y - python-version: 3.8 - mpi: y - omp: y - - libmesh: y - python-version: 3.8 - mpi: y - omp: y - - libmesh: y - python-version: 3.8 - mpi: n - omp: y - - event: y - python-version: 3.8 - omp: y - mpi: n - - vectfit: y - python-version: 3.8 + - python-version: 3.8 omp: n - mpi: y + mpi: n - python-version: 3.9 omp: n mpi: n - - python-version: '3.10' - omp: n + - dagmc: y + python-version: '3.10' + mpi: y + omp: y + - libmesh: y + python-version: '3.10' + mpi: y + omp: y + - libmesh: y + python-version: '3.10' mpi: n + omp: y + - event: y + python-version: '3.10' + omp: y + mpi: n + - vectfit: y + python-version: '3.10' + omp: n + mpi: y name: "Python ${{ matrix.python-version }} (omp=${{ matrix.omp }}, mpi=${{ matrix.mpi }}, dagmc=${{ matrix.dagmc }}, libmesh=${{ matrix.libmesh }}, event=${{ matrix.event }}