Skip to content

Commit

Permalink
Merge pull request #38 from dstl/dev
Browse files Browse the repository at this point in the history
v1.1.0
  • Loading branch information
ChrisMcCarthyDev authored Mar 9, 2023
2 parents dc0e471 + 4df3df5 commit cab32c5
Show file tree
Hide file tree
Showing 473 changed files with 25,100 additions and 18,007 deletions.
2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[flake8]
max-line-length=200
extend-ignore =
D105
D107
D100
D104
E203
E712
D401
exclude =
docs/source/_autosummary
23 changes: 16 additions & 7 deletions .github/workflows/python-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ on:
- main
- dev
- dev-gui
- 'releases/**' # dev-gui to be removed once dev-gui branch is dropped
- 'releases/**'
pull_request:
branches:
- main
- dev
- dev-gui
- 'releases/**' # dev-gui to be removed once dev-gui branch is dropped
- 'releases/**'
jobs:
build:

runs-on: ubuntu-latest
timeout-minutes: 15
timeout-minutes: 20
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10"]
Expand All @@ -40,10 +40,10 @@ jobs:
pip install wheel
- name: Build Yawning-Titan
run: |
python setup.py sdist
python setup.py bdist_wheel
- name: Install Yawning-Titan
run: |
YT=$(ls ./dist/yawningtitan-*.*.*.tar.gz)
YT=$(ls ./dist/yawningtitan-*.*.*-*.whl)
python -m pip install torch==1.11+cpu -f https://download.pytorch.org/whl/torch_stable.html
python -m pip install $YT[dev] --default-timeout 1000
- name: Lint with flake8
Expand All @@ -52,6 +52,15 @@ jobs:
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
- name: Test with pytest
- name: Run unmarked tests
run: |
pytest tests
pytest tests/ -m "not (unit_test or integration_test or e2e_integration_test)"
- name: Run unit tests
run: |
pytest tests/ -m unit_test
- name: Run integration tests
run: |
pytest tests/ -m integration_test
- name: Run integration tests
run: |
pytest tests/ -m e2e_integration_test
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
venv/
YTFrontEnd/
.idea/
.vscode/
*.egg-info
dist/
build/
yawning_titan_gui/network_editor/node_modules
logs/*
!logs/.gitkeep
*__pycache__
Expand All @@ -16,6 +17,10 @@ notebooks/.ipynb_checkpoints
.coverage
*.csv

# generated RST files for documentation
**/source/_autosummary/
docs/source/yt-dependencies.rst

# Remove tensorboard logs starting with ppo-
ppo-*/
**.pkl
Expand Down
5 changes: 0 additions & 5 deletions .modelling/README.md

This file was deleted.

Loading

0 comments on commit cab32c5

Please sign in to comment.