Skip to content

Commit

Permalink
Merge pull request #168 from popsim-consortium/update_requirements
Browse files Browse the repository at this point in the history
Update requirements.txt and some CI config
  • Loading branch information
grahamgower authored Nov 18, 2024
2 parents 44803a9 + c78c5d8 commit 89a054a
Show file tree
Hide file tree
Showing 5 changed files with 489 additions and 40 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ on:

jobs:
build-deploy-docs:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
with:
python-version: "3.10"
python-version: "3.12"

- name: Install dependencies
run: pip install -r requirements.txt
run: pip install -r requirements_CI.txt

- name: Build Docs
run: make -C docs
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, windows-2022, macos-11]
os: [ubuntu-24.04, windows-2022, macos-14]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: 3.12
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install -r requirements.txt
python -m pip install -r requirements_CI.txt
- name: Tests for reference implementation
run: |
cd reference_implementation
Expand Down
43 changes: 22 additions & 21 deletions docs/tutorial.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,28 @@ kernelspec:
language: python
name: python3

substitutions:
example: |
``````{card}
:class-header: sd-bg-dark sd-text-light
Example LABEL
^^^
`````{tab-set}
````{tab-item} YAML
:class-label: pt-0
```{literalinclude} ../examples/tutorial/example_LABEL.yaml
:language: yaml
```
````
````{tab-item} Drawing
:class-label: pt-0
%DRAWING_TAG
```{glue:} example_LABEL
```
````
`````
``````
myst:
substitutions:
example: |
``````{card}
:class-header: sd-bg-dark sd-text-light
Example LABEL
^^^
`````{tab-set}
````{tab-item} YAML
:class-label: pt-0
```{literalinclude} ../examples/tutorial/example_LABEL.yaml
:language: yaml
```
````
````{tab-item} Drawing
:class-label: pt-0
%DRAWING_TAG
```{glue:} example_LABEL
```
````
`````
``````
---

```{code-cell}
Expand Down
25 changes: 12 additions & 13 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
jinja2==3.0.3
jupyter-book==0.13.1
sphinx==4.5.0
sphinx_rtd_theme==1.0.0
pytest==6.2.5
pytest-cov==3.0.0
jsonschema==3.2.0
ruamel.yaml==0.17.17
demes==0.2.2
demesdraw==0.3.0
hypothesis-jsonschema==0.20.1
# See https://github.com/executablebooks/jupyter-book/issues/1902
jupyter-server<2
jinja2
jupyter-book
sphinx
sphinx_rtd_theme
pytest
pytest-cov
jsonschema
ruamel.yaml
demes
demesdraw
hypothesis-jsonschema
jupyter-server
Loading

0 comments on commit 89a054a

Please sign in to comment.