Skip to content

Commit

Permalink
Add versions to dependencies, fix other versions
Browse files Browse the repository at this point in the history
Versions are set to compatibility releases with the ~=. This means versions in the digit not specific are allowed to float, but the last digit given remains fixed.
  • Loading branch information
rafmudaf committed Jun 28, 2024
1 parent 39acf25 commit 4020afc
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 19 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/deploy-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
deploy-book:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Install dependencies
- name: Set up Python 3.9
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: '3.11'

- name: Install dependencies
run: |
Expand All @@ -35,7 +35,7 @@ jobs:
# Push the book's HTML to github-pages
- name: GitHub Pages action
uses: peaceiris/actions-gh-pages@v3.9.2
uses: peaceiris/actions-gh-pages@v4.0.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/_build/html
10 changes: 7 additions & 3 deletions .github/workflows/model_attribute_validation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,24 @@ jobs:
# fail-fast: False

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: '3.10'
# - name: Install project
python-version: '3.11'

# - name: Install project
# run: |
# python -m pip install --upgrade pip
# pip install -e ".[develop]"

- name: Install dependencies
working-directory: ${{runner.workspace}}/WETOStack/
run: |
pip install --upgrade pip
pip install -r requirements.txt
- name: Run validation script
working-directory: ${{runner.workspace}}/WETOStack/software_attributes/
run: |
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,9 @@ Or paste this line directly into your browser bar:
file://<removed>/wetostack/docs/_build/html/index.html
```
Note that the docs/_build folder must be removed and a rebuild done if changes to the software_attributes/database/ yamls are made.
Note that the docs/_build folder must be removed and a rebuild done if changes to the software_attributes/database/ yamls are made.

## Dependencies

The Python packages required to build this project are listed in `requirements.txt`.
Additional dependencies for the documentation are in `docs/requirements.txt`.
16 changes: 8 additions & 8 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
jupyter-book
jupyter-cache
pydata-sphinx-theme
sphinxcontrib.mermaid
sphinxcontrib.youtube
sphinx-simplepdf
jupyter-book~=1.0
jupyter-cache~=1.0
pydata-sphinx-theme~=0.15
sphinxcontrib.mermaid~=0.9
sphinxcontrib.youtube~=1.4
sphinx-simplepdf~=1.6

# attribute tables
# import altair as alt
datapane
pandas
datapane~=0.17
pandas~=1.5
7 changes: 4 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
jsonschema
jsonschema~=4.21
json-schema-for-humans
matplotlib
numpy
matplotlib~=3.9
numpy~=1.26
pygraphviz
pyyaml
squarify

0 comments on commit 4020afc

Please sign in to comment.