Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use geoana 0.2.1 for building the website #579

Merged
merged 26 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
f460934
Pin geoana to 0.1.3 in requirements.txt
santisoler Dec 4, 2024
249314f
Constrain setuptools
santisoler Dec 4, 2024
c0c0ccc
Pin geoana==0.2.1
santisoler Dec 4, 2024
fb9b6d7
Try pinning setuptools < 60.0
santisoler Dec 4, 2024
9a5bfa3
Try installing geoana after installing requirements
santisoler Dec 4, 2024
a526a9c
Revert "Try installing geoana after installing requirements"
santisoler Dec 4, 2024
98cb3bd
Don't upgrade pip before installing requirements
santisoler Dec 4, 2024
28aa815
Remove another pip upgrade
santisoler Dec 4, 2024
cdb62c7
Change order of pip installs
santisoler Dec 4, 2024
dfe00b3
Run pip list
santisoler Dec 4, 2024
c90679c
Add setuptools==0.60
santisoler Dec 4, 2024
2bf74ed
Constrain setuptools to >64
santisoler Dec 4, 2024
0afe51f
Install geoana after installing requirements
santisoler Dec 4, 2024
67fd680
Try pip installing without building geoana in isolation
santisoler Dec 4, 2024
6bd2af5
Add Numpy to requirements.txt
santisoler Dec 4, 2024
2ba5d9a
Try this other thing...
santisoler Dec 4, 2024
96fe58b
Merge branch 'main' into pin-old-geoana
santisoler Dec 4, 2024
b489e68
Use quotes to constrain versions
santisoler Dec 4, 2024
6166147
Merge branch 'pin-old-geoana' of github.com:geoscixyz/em into pin-old…
santisoler Dec 4, 2024
8e17dce
Try this other thing..
santisoler Dec 4, 2024
a3f6fae
Unpin Cython
santisoler Dec 4, 2024
ca2de6f
Add wheel to requirements.txt
santisoler Dec 4, 2024
c318601
Try to clean up some of these changes
santisoler Dec 4, 2024
b690db0
Gather requirements in a new txt file and install geoana separately
santisoler Dec 4, 2024
d3851d2
Install geoana 0.2.1 when building website for deployment
santisoler Dec 4, 2024
06356af
Pin geoana in `requirements.txt`
santisoler Dec 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,16 @@ jobs:
- name: Install dependencies
run: |
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

# Install extra packages
pip install flake8 pytest
pip install -r requirements.txt
- name: Test with pytest
run: |
pytest -s -v tests
Expand All @@ -43,7 +51,13 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.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

- name: Build pages
run: |
Expand Down
13 changes: 13 additions & 0 deletions requirements-build-geoana.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ sphinxcontrib-bibtex
sphinx_rtd_theme
pytest
matplotlib
geoana
geoana==0.2.1
Loading