Skip to content

Commit

Permalink
Merge pull request PSLmodels#902 from jdebacker/demog_extensions
Browse files Browse the repository at this point in the history
Extensions to `demographics.py`
  • Loading branch information
rickecon authored Feb 17, 2024
2 parents 1331b6a + 8fbbb9c commit c9cc292
Show file tree
Hide file tree
Showing 6 changed files with 406 additions and 71 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
uses: actions/checkout@v4
with:
persist-credentials: false

Expand All @@ -26,14 +26,12 @@ jobs:
shell: bash -l {0}
run: |
pip install -e .
pip install jupyter-book>=0.11.3
pip install sphinxcontrib-bibtex>=2.0.0
python -m ipykernel install --user --name=ogcore-dev
cd docs
jb build ./book
- name: Deploy
uses: JamesIves/github-pages-deploy-action@releases/v3
uses: JamesIves/github-pages-deploy-action@v4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to.
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/docs_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
uses: actions/checkout@v4 # If you're using actions/checkout@v2 you must set persist-credentials to false in most cases for the deployment to work correctly.
with:
persist-credentials: false

Expand All @@ -23,8 +23,6 @@ jobs:
shell: bash -l {0}
run: |
pip install -e .
pip install jupyter-book>=0.11.3
pip install sphinxcontrib-bibtex>=2.0.0
python -m ipykernel install --user --name=ogcore-dev
cd docs
jb build ./book
9 changes: 9 additions & 0 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ channels:
- conda-forge
dependencies:
- python>=3.7.7, <3.12
- numpy
- ipython
- setuptools
- scipy>=1.7.1
Expand All @@ -12,6 +13,13 @@ dependencies:
- dask-core>=2.30.0
- distributed>=2.30.1
- paramtools>=0.15.0
- sphinx
- sphinx-argparse
- sphinxcontrib-bibtex>=2.0.0
- sphinx-math-dollar
- pydata-sphinx-theme
- jupyter-book>=0.11.3
- jupyter
- pytest>=6.0
- pytest-xdist
- pylint
Expand All @@ -22,3 +30,4 @@ dependencies:
- pip
- pip:
- pygam
- linecheck
Loading

0 comments on commit c9cc292

Please sign in to comment.