Skip to content

Commit

Permalink
Merge branch 'events' of github.com:XAMS-nikhef/amstrax into events
Browse files Browse the repository at this point in the history
  • Loading branch information
cfuselli committed Dec 6, 2023
2 parents 9ce5994 + 04a6722 commit 073263e
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/code_style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ jobs:
name: Quality check
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4.2.0
uses: actions/setup-python@v4.7.1
with:
python-version: 3.8
- name: Change __all__ exports for pyflake
run: |
bash .github/scripts/pre_pyflakes.sh
- name: Wemake Python Stylguide
uses: wemake-services/wemake-python-styleguide@0.17.0
uses: wemake-services/wemake-python-styleguide@0.18.0
continue-on-error: true
with:
reporter: 'github-pr-review'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ jobs:
steps:
# Setup steps
- name: Setup python
uses: actions/setup-python@v4.2.0
uses: actions/setup-python@v4.7.1
with:
python-version: '3.8'
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install dependencies
run: pip install wheel
- name: Build package
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
steps:
# Setup and installation
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup python
uses: actions/setup-python@v4.2.0
uses: actions/setup-python@v4.7.1
with:
python-version: ${{ matrix.python-version }}
cache: 'pip'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
python-version: [3.8, 3.9, "3.10"]
steps:
- name: Setup python
uses: actions/setup-python@v4.2.0
uses: actions/setup-python@v4.7.1
with:
python-version: ${{ matrix.python-version }}
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Install amstrax
run: |
pip install -r requirements.txt
Expand Down
10 changes: 7 additions & 3 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
# Required
version: 2

build:
os: "ubuntu-22.04"
tools:
python: "miniconda3-4.7"

sphinx:
configuration: docs/source/conf.py

build:
image: latest
conda:
environment: docs/environment.yml

python:
version: "3.8"
install:
- requirements: extra_requirements/requirements-tests.txt
- method: pip
Expand Down
8 changes: 8 additions & 0 deletions docs/environment.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: amstrax-docs
dependencies:
- python=3.8
- graphviz
- pip
- pip:
- -r ../requirements.txt
- -r ../extra_requirements/requirements-docs.txt
4 changes: 2 additions & 2 deletions extra_requirements/requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ numpy==1.23.3
autodocsumm==0.2.9
scipy==1.9.1
commonmark==0.9.1
gitpython==3.1.35
gitpython==3.1.40
graphviz==0.20.1
nbsphinx==0.8.9
nbsphinx==0.9.3
recommonmark==0.7.1
sphinx==5.2.3
sphinx_rtd_theme==1.0.0
Expand Down

0 comments on commit 073263e

Please sign in to comment.