From 6590edcb26ca1ecc91c2cfcc0f9434ce3b4288a6 Mon Sep 17 00:00:00 2001 From: Ana Mileva Date: Thu, 9 Jun 2022 13:37:51 -0700 Subject: [PATCH 1/5] Initial change --- .github/workflows/test_gridpath.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test_gridpath.yml b/.github/workflows/test_gridpath.yml index a3aa2b97b..876f43f4a 100644 --- a/.github/workflows/test_gridpath.yml +++ b/.github/workflows/test_gridpath.yml @@ -6,7 +6,7 @@ name: test-suite on: push: - branches: [ main, develop ] + branches: [ main, develop, test_on_multiple_python_versions ] pull_request: branches: [ main, develop ] schedule: @@ -16,13 +16,16 @@ jobs: build: runs-on: ubuntu-latest + strategy: + matrix: + python-version: [ "3.8" ] steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.8 - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - name: Set up Python + uses: actions/setup-python@v3 with: - python-version: "3.8" + python-version: ${{ matrix.python-version }} - name: Install Cbc and check version run: | sudo apt-get install coinor-cbc From 42e7ce3cdf1a81188eecd6a3e3824aa94b04f79d Mon Sep 17 00:00:00 2001 From: Ana Mileva Date: Thu, 9 Jun 2022 13:43:40 -0700 Subject: [PATCH 2/5] try multiple versions --- .github/workflows/test_gridpath.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_gridpath.yml b/.github/workflows/test_gridpath.yml index 876f43f4a..36a270c39 100644 --- a/.github/workflows/test_gridpath.yml +++ b/.github/workflows/test_gridpath.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ "3.8" ] + python-version: [ "3.8", "3.9", "3.10" ] steps: - uses: actions/checkout@v3 From a79f9785e3214d62c58dfc402882ebb866297e73 Mon Sep 17 00:00:00 2001 From: Ana Mileva Date: Thu, 9 Jun 2022 14:23:23 -0700 Subject: [PATCH 3/5] Fix for v3.10 pandas wheel built taking a long time --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7f7554b21..77e9c2ad5 100644 --- a/setup.py +++ b/setup.py @@ -41,7 +41,7 @@ packages=find_packages(), install_requires=[ "Pyomo==6.3.0", # Optimization modeling language - "pandas==1.2.5", # Data-processing + "pandas==1.4.2", # Data-processing "bokeh==2.2.3", # Visualization library (required - see #779) "pscript==0.7.5", # Python to JavaScript compiler (for viz) "networkx==2.5.1", # network package for DC OPF From aec1c7a80db55dde38cb08a7de7e661c30584e65 Mon Sep 17 00:00:00 2001 From: Ana Mileva Date: Thu, 9 Jun 2022 14:28:57 -0700 Subject: [PATCH 4/5] Remove test branch --- .github/workflows/test_gridpath.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_gridpath.yml b/.github/workflows/test_gridpath.yml index 36a270c39..a9f62d083 100644 --- a/.github/workflows/test_gridpath.yml +++ b/.github/workflows/test_gridpath.yml @@ -6,7 +6,7 @@ name: test-suite on: push: - branches: [ main, develop, test_on_multiple_python_versions ] + branches: [ main, develop ] pull_request: branches: [ main, develop ] schedule: From f0f4e49ed0ac3dfb60bb2c91c4fca7d0899c92a3 Mon Sep 17 00:00:00 2001 From: Ana Mileva Date: Thu, 9 Jun 2022 14:30:15 -0700 Subject: [PATCH 5/5] Trying building the docs on 3.10 --- .readthedocs.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 2f75bad5d..33b439da9 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -9,7 +9,7 @@ version: 2 build: os: ubuntu-20.04 tools: - python: "3.9" + python: "3.10" # Build documentation in the doc/ directory with Sphinx sphinx: