Skip to content

Commit

Permalink
updated env
Browse files Browse the repository at this point in the history
  • Loading branch information
carlocamilloni committed Feb 7, 2025
1 parent 19ea0e0 commit 314fec0
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 30 deletions.
28 changes: 8 additions & 20 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,17 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: ~/.ccache
key: ccache-reset-${{ github.sha }}
restore-keys: ccache-reset-
- name: Set up Python 3.11
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.13'
- name: Add conda to system path
run: |
# $CONDA is an environment variable pointing to the root of the miniconda directory
echo $CONDA/bin >> $GITHUB_PATH
- name: Install dependencies with conda
run: |
conda install --solver=classic -y python=3.11
conda install --solver=classic -y python=3.13
conda env update --solver=classic --file conda/environment.yml --name base
conda install --solver=classic flake8
- name: Run flake8
Expand All @@ -51,7 +46,6 @@ jobs:
uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'
- name: Install requirements
run: pip install -r requirements.txt
- name: Run tests
Expand All @@ -64,23 +58,18 @@ jobs:

steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: ~/.ccache
key: ccache-reset-${{ github.sha }}
restore-keys: ccache-reset-
- name: Set up Python 3.11
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: '3.13'
- name: Add conda to system path
uses: conda-incubator/setup-miniconda@v3
with:
activate-environment:
- name: Install dependencies with conda
run: |
echo $CONDA/bin >> $GITHUB_PATH
conda install -y python=3.11
conda install -y python=3.13
conda env update --file conda/environment.yml --name base
- name: Run tests
run: |
Expand All @@ -91,11 +80,10 @@ jobs:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- name: Set up Python 3.9
- name: Set up Python 3.13
uses: actions/setup-python@v5
with:
python-version: '3.9'
cache: 'pip'
python-version: '3.13'
- name: Install requirements
run: pip install -r requirements.txt
- name: Run tests
Expand Down
8 changes: 4 additions & 4 deletions conda/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ channels:
- conda-forge
- defaults
dependencies:
- python=3.11
- python=3.13
- numpy
- pandas
- parmed
- gitpython
- pyyaml
- ParmEd
- GitPython
- PyYAML
- scipy
- h5py
- pytables
12 changes: 6 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
ParmEd>=3.4.3
numpy>=1.26.2
pandas>=2.1.3
pyyaml>=6.0.1
gitpython>=3.1.43
GitPython>=3.1.44
h5py>=3.11.0
scipy>=1.13.0
numpy>=2.2.2
pandas>=2.2.3
ParmEd>=4.2.2
PyYAML>=6.0.2
scipy>=1.15.1
tables>=3.9.2

0 comments on commit 314fec0

Please sign in to comment.