Skip to content

Commit

Permalink
Merge pull request #214 from scikit-mobility/1.2.x
Browse files Browse the repository at this point in the history
Update 1.2.3 release
  • Loading branch information
miccferr committed Feb 5, 2022
2 parents 023918e + 5370f5c commit 30d6ea0
Show file tree
Hide file tree
Showing 6 changed files with 662 additions and 513 deletions.
32 changes: 15 additions & 17 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,25 @@ jobs:
# We want to run on external PRs, but not on our own internal PRs as they'll be run
# by the push to the branch. Without this if check, checks are duplicated since
# internal PRs match both the push and pull_request events.
if:
github.event_name == 'push' || github.event.pull_request.head.repo.full_name !=
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name !=
github.repository
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- name: 'Set up Python'
- name: "Set up Python"
uses: actions/setup-python@v2
with:
python-version: 3.6

- name: 'Install dependencies'
- name: "Install dependencies"
run: |
python -m pip install --upgrade pre-commit poetry
- name: Lint
run: pre-commit run --show-diff-on-failure --files skmob/tessellation/*


test:
# runs only when lint step succeeds
needs: lint
Expand All @@ -36,7 +34,7 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: 'Set up Python'
- name: "Set up Python"
uses: actions/setup-python@v2
with:
python-version: 3.6
Expand All @@ -46,11 +44,11 @@ jobs:
python -m pip install --upgrade pip
python -m pip install --upgrade poetry tox
- name: 'Test and coverage'
run: |
- name: "Test and coverage"
run: |
python3 -m tox -e py36
- name: 'Upload Artifact'
- name: "Upload Artifact"
uses: actions/upload-artifact@v2
with:
name: code-coverage
Expand All @@ -65,36 +63,36 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: 'Set up Python'
- name: "Set up Python"
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.6.15

- name: 'Install dependencies'
- name: "Install dependencies"
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade poetry sphinx sphinx_rtd_theme sphinx-copybutton
poetry export --dev -f requirements.txt > requirements.txt
pip install -r requirements.txt
- name: 'Build documentation'
- name: "Build documentation"
working-directory: docs
run: make html
run: make html

# we need nojekyll or github will ignore folders starting with "_"
- name: 'Copy static files'
- name: "Copy static files"
run: |
mv .nojekyll static/html
mv logo_skmob.png static/html
mkdir static/html/coverage
- name: 'Download Artifact'
- name: "Download Artifact"
uses: actions/download-artifact@v2
with:
name: code-coverage
path: static/html/coverage

- name: 'Deploy Docs 🚀'
- name: "Deploy Docs 🚀"
uses: JamesIves/github-pages-deploy-action@4.1.1
with:
branch: gh-pages # The branch the action should deploy to.
Expand Down
24 changes: 12 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/pre-commit/mirrors-isort
- id: check-yaml
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/pre-commit/mirrors-isort
rev: v5.5.4
hooks:
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/python/black
- id: isort
args: ["--profile", "black"]
- repo: https://github.com/python/black
rev: 20.8b1
hooks:
- id: black
language_version: python3.6
- repo: https://gitlab.com/pycqa/flake8
- id: black
language_version: python3.6
- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
hooks:
- id: flake8
- id: flake8
Loading

0 comments on commit 30d6ea0

Please sign in to comment.