Skip to content

Commit

Permalink
pin pandas<2.1 and add cron trigger to CI (#92)
Browse files Browse the repository at this point in the history
* Update CI.yaml

* Update pyproject.toml

* Update test_env.yaml

* pin pandas<2.1 in requirements.txt

* update docs

* add python to build tools

* fix readthedocs?

* try building RTD with mambaforge

following https://docs.readthedocs.io/en/stable/config-file/v2.html#conda

* Update requirements.yaml

---------

Co-authored-by: Oliver Beckstein <[email protected]>
Co-authored-by: orioncohen <[email protected]>
  • Loading branch information
3 people authored Sep 19, 2023
1 parent 055cbd9 commit 514472c
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ on:
pull_request:
branches:
- "main"
schedule:
# Midnight Tuesdays and Fridays
- cron: "0 0 * * 2,5"

concurrency:
# Probably overly cautious group naming.
Expand Down Expand Up @@ -98,4 +101,4 @@ jobs:
- name: Run tests
run: |
pytest -v --color=yes solvation_analysis/tests/
pytest -v --color=yes solvation_analysis/tests/
4 changes: 2 additions & 2 deletions devtools/conda-envs/test_env.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ dependencies:
- MDAnalysis>=2.0.0
- scipy
- numpy
- pandas
- pandas<2.1
- matplotlib
- statsmodels
- pytest
- pytest-cov
- codecov
- rdkit
- plotly
- plotly
1 change: 1 addition & 0 deletions docs/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ dependencies:
- nglview
- nbsphinx
- ipython
- plotly


# Pip-only installs
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ keywords = [

dependencies = [
'numpy>=1.20.0',
'pandas',
'pandas<2.1',
'mdanalysis>=2.0.0',
'pytest',
'matplotlib',
Expand Down
12 changes: 4 additions & 8 deletions readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@
version: 2

build:
image: latest

python:
version: 3.8
install:
- method: pip
path: .
os: ubuntu-22.04
tools:
python: "mambaforge-22.9"

conda:
environment: docs/requirements.yaml
environment: docs/requirements.yaml
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
setuptools
numpy>=1.20.0
pandas
pandas<2.1
mdanalysis>=2.0.0
pytest
pathlib
matplotlib
scipy
statsmodels
plotly
rdkit
rdkit

0 comments on commit 514472c

Please sign in to comment.