From f460934b5ce9e4bed65f3002a1704b1f9b016792 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 10:16:36 -0800 Subject: [PATCH 01/24] Pin geoana to 0.1.3 in requirements.txt Try to see if this solves an error in `ElectrostaticSphere` due to a change in the expected type of the `primary_field` argument. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 95ebc05a..e0cb89ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -geoana +geoana==0.1.3 From 249314f7824480ed604cc0249a2590a22b194b38 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 11:33:46 -0800 Subject: [PATCH 02/24] Constrain setuptools --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index e0cb89ef..9d99b852 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ sphinx_rtd_theme pytest matplotlib geoana==0.1.3 +setuptools <65 # needed to pin geoana to 0.1.3 From c0c0cccd4f1a58a1dfc36068eebe2749aed2aca7 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:12:18 -0800 Subject: [PATCH 03/24] Pin geoana==0.2.1 --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9d99b852..98f84f33 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,4 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -geoana==0.1.3 -setuptools <65 # needed to pin geoana to 0.1.3 +geoana==0.2.1 From fb9b6d7fd558ad673bee78729e0f72f7ba63af85 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:16:13 -0800 Subject: [PATCH 04/24] Try pinning setuptools < 60.0 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 98f84f33..8468e3fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ sphinx_rtd_theme pytest matplotlib geoana==0.2.1 +setuptools < 60.0 From 9a5bfa382d2bbcb2ce523c654d14c06fe099dde1 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:19:39 -0800 Subject: [PATCH 05/24] Try installing geoana after installing requirements --- .github/workflows/python-app.yml | 1 + requirements.txt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 98c50827..15862f04 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -26,6 +26,7 @@ jobs: python -m pip install --upgrade pip pip install flake8 pytest pip install -r requirements.txt + pip install geoana==0.2.1 - name: Test with pytest run: | pytest -s -v tests diff --git a/requirements.txt b/requirements.txt index 8468e3fc..e0eee95e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,4 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -geoana==0.2.1 -setuptools < 60.0 +# geoana From a526a9c7bfa48d27b0f6727c8e18ab92849d583f Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:20:48 -0800 Subject: [PATCH 06/24] Revert "Try installing geoana after installing requirements" This reverts commit 9a5bfa382d2bbcb2ce523c654d14c06fe099dde1. --- .github/workflows/python-app.yml | 1 - requirements.txt | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 15862f04..98c50827 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -26,7 +26,6 @@ jobs: python -m pip install --upgrade pip pip install flake8 pytest pip install -r requirements.txt - pip install geoana==0.2.1 - name: Test with pytest run: | pytest -s -v tests diff --git a/requirements.txt b/requirements.txt index e0eee95e..8468e3fc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,5 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -# geoana +geoana==0.2.1 +setuptools < 60.0 From 98cb3bd99a7864d91b6d7792b745b4fdd5468ba9 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:21:11 -0800 Subject: [PATCH 07/24] Don't upgrade pip before installing requirements Just use the old pip for Python 3.9 --- .github/workflows/python-app.yml | 1 - requirements.txt | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 98c50827..a7a9ed3d 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -43,7 +43,6 @@ jobs: - name: Install dependencies run: | - python -m pip install --upgrade pip pip install -r requirements.txt - name: Build pages diff --git a/requirements.txt b/requirements.txt index 8468e3fc..98f84f33 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,3 @@ sphinx_rtd_theme pytest matplotlib geoana==0.2.1 -setuptools < 60.0 From 28aa8157f5869aee0c71ab44f696393a43fdee9f Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:25:25 -0800 Subject: [PATCH 08/24] Remove another pip upgrade --- .github/workflows/python-app.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index a7a9ed3d..feff17e1 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -23,7 +23,6 @@ jobs: python-version: 3.9 - name: Install dependencies run: | - python -m pip install --upgrade pip pip install flake8 pytest pip install -r requirements.txt - name: Test with pytest From cdb62c7465d0791ac254793286d6c8ee19705c3e Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:30:00 -0800 Subject: [PATCH 09/24] Change order of pip installs --- .github/workflows/python-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index feff17e1..045db25a 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -23,8 +23,8 @@ jobs: python-version: 3.9 - name: Install dependencies run: | - pip install flake8 pytest pip install -r requirements.txt + pip install flake8 pytest - name: Test with pytest run: | pytest -s -v tests From dfe00b330bd9977d2ab37972250621d355748109 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:31:33 -0800 Subject: [PATCH 10/24] Run pip list --- .github/workflows/python-app.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 045db25a..a1adb503 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -23,6 +23,7 @@ jobs: python-version: 3.9 - name: Install dependencies run: | + pip list pip install -r requirements.txt pip install flake8 pytest - name: Test with pytest From c90679ce8aaa87ae69299dd66d1e05b164d1ed5a Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:32:50 -0800 Subject: [PATCH 11/24] Add setuptools==0.60 --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 98f84f33..a89a7b5c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ sphinx_rtd_theme pytest matplotlib geoana==0.2.1 +setuptools==0.60 From 2bf74edfbcb8f24083673230ccd59d40d0736aed Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:33:56 -0800 Subject: [PATCH 12/24] Constrain setuptools to >64 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a89a7b5c..582e17a1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ sphinx_rtd_theme pytest matplotlib geoana==0.2.1 -setuptools==0.60 +setuptools>64 From 0afe51f83d02dab8bad2e32ffa8116044a80a523 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:35:11 -0800 Subject: [PATCH 13/24] Install geoana after installing requirements --- .github/workflows/python-app.yml | 1 + requirements.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index a1adb503..3a754a41 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -25,6 +25,7 @@ jobs: run: | pip list pip install -r requirements.txt + pip install geoana==0.2.1 pip install flake8 pytest - name: Test with pytest run: | diff --git a/requirements.txt b/requirements.txt index 582e17a1..ff8e3dcf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -geoana==0.2.1 +# geoana==0.2.1 setuptools>64 From 67fd680bc690ab7226d2062d9b835c4000af7ee9 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:41:36 -0800 Subject: [PATCH 14/24] Try pip installing without building geoana in isolation --- .github/workflows/python-app.yml | 5 ++--- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 3a754a41..a9b68a56 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -23,9 +23,8 @@ jobs: python-version: 3.9 - name: Install dependencies run: | - pip list - pip install -r requirements.txt - pip install geoana==0.2.1 + python -m pip install --upgrade pip + pip install --no-build-isolation -r requirements.txt pip install flake8 pytest - name: Test with pytest run: | diff --git a/requirements.txt b/requirements.txt index ff8e3dcf..5f9f478b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -# geoana==0.2.1 -setuptools>64 +geoana==0.2.1 +setuptools<60 From 6bd2af5e7795c8b5a14d687595622f0a52bb3cde Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:42:43 -0800 Subject: [PATCH 15/24] Add Numpy to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 5f9f478b..4f3bc584 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,6 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib +numpy<1.23 geoana==0.2.1 setuptools<60 From 2ba5d9aeb4d9452c7640241e6f94d17efc0a9e86 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:48:41 -0800 Subject: [PATCH 16/24] Try this other thing... --- .github/workflows/python-app.yml | 8 +++++++- requirements.txt | 4 +--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index a9b68a56..3fdc24b2 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -24,7 +24,13 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install --no-build-isolation -r requirements.txt + pip install -r requirements.txt + + # Install build requirements for geoana 0.2.1 + pip install numpy<1.23 setuptools<60 + pip install --no-build-isolation geoana==0.2.1 + + # Install extra packages pip install flake8 pytest - name: Test with pytest run: | diff --git a/requirements.txt b/requirements.txt index 4f3bc584..e86bb34d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,6 +3,4 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -numpy<1.23 -geoana==0.2.1 -setuptools<60 +# geoana==0.2.1 From b489e68c6e900d276e3e05bed7abed6fcae683bc Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 12:53:17 -0800 Subject: [PATCH 17/24] Use quotes to constrain versions --- .github/workflows/python-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 3fdc24b2..73402793 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -27,7 +27,7 @@ jobs: pip install -r requirements.txt # Install build requirements for geoana 0.2.1 - pip install numpy<1.23 setuptools<60 + pip install "numpy<1.23" "setuptools<60" pip install --no-build-isolation geoana==0.2.1 # Install extra packages From 8e17dceb9e7a8af0c806651b7b39d63a050bb988 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 13:06:16 -0800 Subject: [PATCH 18/24] Try this other thing.. --- .github/workflows/python-app.yml | 2 -- requirements.txt | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index e34ed089..454714f4 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -25,8 +25,6 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt - # Install build requirements for geoana 0.2.1 - pip install "numpy<1.23" "setuptools<60" pip install --no-build-isolation geoana==0.2.1 # Install extra packages diff --git a/requirements.txt b/requirements.txt index e86bb34d..172f21b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,6 @@ sphinx_rtd_theme pytest matplotlib # geoana==0.2.1 +numpy<1.23 +cython==0.29 +setuptools<60 From a3f6fae97219bd05e893c72debdfaf8d03626123 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 13:08:59 -0800 Subject: [PATCH 19/24] Unpin Cython --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 172f21b9..85e8e360 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,5 +5,5 @@ pytest matplotlib # geoana==0.2.1 numpy<1.23 -cython==0.29 +cython setuptools<60 From ca2de6f84c76cb11f7c8a4adc2922e4b050ecba0 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 13:13:15 -0800 Subject: [PATCH 20/24] Add wheel to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 85e8e360..1a0bbcae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,3 +7,4 @@ matplotlib numpy<1.23 cython setuptools<60 +wheel From c31860134d982d5ff6644433f0598d5637296861 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 13:21:25 -0800 Subject: [PATCH 21/24] Try to clean up some of these changes The build process worked in the previous commit! So now let's try to make things clean. --- .github/workflows/python-app.yml | 4 ++-- requirements-build-geoana.txt | 13 +++++++++++++ requirements.txt | 6 +----- 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 requirements-build-geoana.txt diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index 454714f4..e970f041 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -23,9 +23,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -r requirements.txt + # pip install -r requirements.txt - pip install --no-build-isolation geoana==0.2.1 + pip install --no-build-isolation -r requirements.txt -r requirements-build-geoana.txt # Install extra packages pip install flake8 pytest diff --git a/requirements-build-geoana.txt b/requirements-build-geoana.txt new file mode 100644 index 00000000..8b6f52a0 --- /dev/null +++ b/requirements-build-geoana.txt @@ -0,0 +1,13 @@ +# Requirements to build geoana 0.2.1 without isolation +# +# This file was added as a way to install geoana 0.2.1 (old version) in GitHub +# Actions and build the website using an this old version of geoana. +# +# We should remove this file after updating the repo to work with the latest +# version of geoana. The easiest way to do so would be to revert the commit +# that added this file. +# +numpy<1.23 +cython +setuptools<60 +wheel diff --git a/requirements.txt b/requirements.txt index 1a0bbcae..98f84f33 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,4 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -# geoana==0.2.1 -numpy<1.23 -cython -setuptools<60 -wheel +geoana==0.2.1 From b690db0c36fd132753861b2bf95f4e771d7e2996 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 13:42:56 -0800 Subject: [PATCH 22/24] Gather requirements in a new txt file and install geoana separately --- .github/workflows/python-app.yml | 8 ++++++-- requirements.txt | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index e970f041..b7e76d7a 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -23,9 +23,13 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - # pip install -r requirements.txt - pip install --no-build-isolation -r requirements.txt -r requirements-build-geoana.txt + # Gather requirements and install older version of geoana + cat requirements.txt | grep -v "^geoana" > requirements-ci.txt + cat requirements-build-geoana.txt | grep -v "^#" >> requirements-ci.txt + pip install -r requirements-ci.txt + rm requirements-ci.txt + pip install --no-build-isolation geoana==0.2.1 # Install extra packages pip install flake8 pytest diff --git a/requirements.txt b/requirements.txt index 98f84f33..95ebc05a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -geoana==0.2.1 +geoana From d3851d21e2db0fc963ed7804b8657a587daf9084 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 13:44:46 -0800 Subject: [PATCH 23/24] Install geoana 0.2.1 when building website for deployment --- .github/workflows/python-app.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index b7e76d7a..aae93f9e 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -50,7 +50,14 @@ jobs: - name: Install dependencies run: | - pip install -r requirements.txt + python -m pip install --upgrade pip + + # Gather requirements and install older version of geoana + cat requirements.txt | grep -v "^geoana" > requirements-ci.txt + cat requirements-build-geoana.txt | grep -v "^#" >> requirements-ci.txt + pip install -r requirements-ci.txt + rm requirements-ci.txt + pip install --no-build-isolation geoana==0.2.1 - name: Build pages run: | From 06356af63fab3910cbd00197717ae0d906d80dd9 Mon Sep 17 00:00:00 2001 From: Santiago Soler Date: Wed, 4 Dec 2024 13:48:39 -0800 Subject: [PATCH 24/24] Pin geoana in `requirements.txt` It's nice to pin it there as well in case we are trying to create the environment locally. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 95ebc05a..98f84f33 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ sphinxcontrib-bibtex sphinx_rtd_theme pytest matplotlib -geoana +geoana==0.2.1