Skip to content

Commit 3bd5121

Browse files
authored
Merge branch 'main' into tree_dags
2 parents eec3d23 + b3cd191 commit 3bd5121

24 files changed

+1735
-259
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,67 +1,53 @@
1+
---
12
name: main
23
on:
34
push:
4-
branches:
5-
- main
5+
branches: [main]
66
pull_request:
77
branches:
8-
- '*'
9-
8+
- '*'
109
# Automatically cancel a previous run.
1110
concurrency:
1211
group: ${{ github.head_ref || github.run_id }}
1312
cancel-in-progress: true
14-
1513
jobs:
16-
1714
run-tests:
18-
1915
name: Run tests for ${{ matrix.os }} on ${{ matrix.python-version }}
2016
runs-on: ${{ matrix.os }}
21-
2217
strategy:
2318
fail-fast: false
2419
matrix:
25-
os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
26-
python-version: ['3.7', '3.8', '3.9', '3.10']
27-
20+
os: [ubuntu-latest, macos-latest, windows-latest]
21+
python-version: ['3.9', '3.10', '3.11']
2822
steps:
2923
- uses: actions/checkout@v2
3024
- uses: conda-incubator/setup-miniconda@v2
3125
with:
3226
auto-update-conda: true
3327
python-version: ${{ matrix.python-version }}
34-
3528
- name: Install core dependencies.
3629
shell: bash -l {0}
3730
run: conda install -c conda-forge tox-conda
38-
3931
- name: Run pytest.
4032
shell: bash -l {0}
4133
run: tox -e pytest -- -m "not slow" --cov-report=xml --cov=./
42-
4334
- name: Upload coverage report.
4435
if: runner.os == 'Linux' && matrix.python-version == '3.9'
4536
uses: codecov/codecov-action@v1
4637
with:
4738
token: ${{ secrets.CODECOV_TOKEN }}
48-
4939
docs:
50-
5140
name: Run documentation.
5241
runs-on: ubuntu-latest
53-
5442
steps:
5543
- uses: actions/checkout@v2
5644
- uses: conda-incubator/setup-miniconda@v2
5745
with:
5846
auto-update-conda: true
5947
python-version: 3.9
60-
6148
- name: Install core dependencies.
6249
shell: bash -l {0}
6350
run: conda install -c conda-forge tox-conda
64-
6551
- name: Build docs
6652
shell: bash -l {0}
6753
run: tox -e sphinx

.github/workflows/publish-to-pypi.yml

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,31 @@
1+
---
12
name: PyPI
2-
33
on: push
4-
54
jobs:
65
build-n-publish:
76
name: Build and publish Python 🐍 distributions 📦 to PyPI
87
runs-on: ubuntu-latest
98
steps:
10-
- uses: actions/checkout@master
11-
12-
- name: Set up Python 3.8
13-
uses: actions/setup-python@v1
14-
with:
15-
python-version: 3.8
16-
17-
- name: Install pypa/build
18-
run: >-
19-
python -m
20-
pip install
21-
build
22-
--user
23-
- name: Build a binary wheel and a source tarball
24-
run: >-
25-
python -m
26-
build
27-
--sdist
28-
--wheel
29-
--outdir dist/
30-
- name: Publish distribution 📦 to PyPI
31-
if: startsWith(github.ref, 'refs/tags')
32-
uses: pypa/gh-action-pypi-publish@master
33-
with:
34-
password: ${{ secrets.PYPI_API_TOKEN }}
9+
- uses: actions/checkout@master
10+
- name: Set up Python 3.8
11+
uses: actions/setup-python@v1
12+
with:
13+
python-version: 3.8
14+
- name: Install pypa/build
15+
run: >-
16+
python -m
17+
pip install
18+
build
19+
--user
20+
- name: Build a binary wheel and a source tarball
21+
run: >-
22+
python -m
23+
build
24+
--sdist
25+
--wheel
26+
--outdir dist/
27+
- name: Publish distribution 📦 to PyPI
28+
if: startsWith(github.ref, 'refs/tags')
29+
uses: pypa/gh-action-pypi-publish@master
30+
with:
31+
password: ${{ secrets.PYPI_API_TOKEN }}

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ ipython_config.py
8484
# VS Code
8585
.vscode
8686

87+
# IntelliJ
88+
.idea/
89+
8790
# pyenv
8891
.python-version
8992

.pre-commit-config.yaml

Lines changed: 49 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,51 @@
1+
---
12
repos:
2-
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.3.0
4-
hooks:
5-
- id: check-merge-conflict
6-
- id: debug-statements
7-
- id: end-of-file-fixer
8-
- repo: https://github.com/asottile/reorder_python_imports
9-
rev: v3.8.3
10-
hooks:
11-
- id: reorder-python-imports
12-
types: [python]
13-
- repo: https://github.com/pre-commit/pre-commit-hooks
14-
rev: v4.3.0
15-
hooks:
16-
- id: check-added-large-files
17-
args: ['--maxkb=100']
18-
- id: check-case-conflict
19-
- id: check-merge-conflict
20-
- id: check-vcs-permalinks
21-
- id: check-yaml
22-
- id: debug-statements
23-
- id: end-of-file-fixer
24-
- id: fix-byte-order-marker
25-
- id: mixed-line-ending
26-
- id: no-commit-to-branch
3+
- repo: meta
4+
hooks:
5+
- id: check-hooks-apply
6+
- id: check-useless-excludes
7+
# - id: identity # Prints all files passed to pre-commits. Debugging.
8+
- repo: https://github.com/lyz-code/yamlfix
9+
rev: 1.17.0
10+
hooks:
11+
- id: yamlfix
12+
- repo: https://github.com/pre-commit/pre-commit-hooks
13+
rev: v5.0.0
14+
hooks:
15+
- id: check-added-large-files
16+
args: [--maxkb=10000]
17+
- id: check-case-conflict
18+
- id: check-merge-conflict
19+
- id: check-vcs-permalinks
20+
- id: check-yaml
21+
- id: check-toml
22+
- id: debug-statements
23+
- id: end-of-file-fixer
24+
- id: fix-byte-order-marker
25+
types: [text]
26+
- id: forbid-submodules
27+
- id: mixed-line-ending
28+
args: [--fix=lf]
29+
description: Forces to replace line ending by the UNIX 'lf' character.
30+
- id: no-commit-to-branch
2731
args: [--branch, main]
28-
- id: trailing-whitespace
29-
- repo: https://github.com/pre-commit/pygrep-hooks
30-
rev: v1.9.0
31-
hooks:
32-
- id: python-check-blanket-noqa
33-
- id: python-check-mock-methods
34-
- id: python-no-eval
35-
- id: python-no-log-warn
36-
- id: python-use-type-annotations
37-
- id: rst-backticks
38-
- id: rst-directive-colons
39-
- id: rst-inline-touching-normal
40-
- id: text-unicode-replacement-char
41-
- repo: https://github.com/asottile/blacken-docs
42-
rev: v1.12.1
43-
hooks:
44-
- id: blacken-docs
45-
additional_dependencies: [black==22.3.0]
46-
types: [rst]
47-
- repo: https://github.com/psf/black
48-
rev: 22.8.0
49-
hooks:
50-
- id: black
51-
types: [python]
52-
- repo: https://github.com/PyCQA/flake8
53-
rev: 5.0.4
54-
hooks:
55-
- id: flake8
56-
types: [python]
57-
additional_dependencies: [
58-
flake8-alfred,
59-
flake8-bugbear,
60-
flake8-builtins,
61-
flake8-comprehensions,
62-
flake8-docstrings,
63-
flake8-eradicate,
64-
flake8-print,
65-
flake8-pytest-style,
66-
flake8-todo,
67-
flake8-typing-imports,
68-
flake8-unused-arguments,
69-
pep8-naming,
70-
pydocstyle,
71-
Pygments,
72-
]
73-
- repo: https://github.com/PyCQA/doc8
74-
rev: v1.0.0
75-
hooks:
76-
- id: doc8
77-
- repo: meta
78-
hooks:
79-
- id: check-hooks-apply
80-
- id: check-useless-excludes
81-
# - id: identity # Prints all files passed to pre-commits. Debugging.
82-
- repo: https://github.com/mgedmin/check-manifest
83-
rev: "0.48"
84-
hooks:
85-
- id: check-manifest
86-
args: [--no-build-isolation]
87-
additional_dependencies: [setuptools-scm, toml]
88-
- repo: https://github.com/PyCQA/doc8
89-
rev: v1.0.0
90-
hooks:
91-
- id: doc8
92-
- repo: https://github.com/asottile/setup-cfg-fmt
93-
rev: v2.0.0
94-
hooks:
95-
- id: setup-cfg-fmt
96-
- repo: https://github.com/econchick/interrogate
97-
rev: 1.5.0
98-
hooks:
99-
- id: interrogate
100-
args: [-v, --fail-under=20]
101-
exclude: ^(tests|docs|setup\.py)
102-
- repo: https://github.com/codespell-project/codespell
103-
rev: v2.2.1
104-
hooks:
105-
- id: codespell
106-
- repo: https://github.com/asottile/pyupgrade
107-
rev: v2.38.2
108-
hooks:
109-
- id: pyupgrade
110-
args: [--py37-plus]
32+
- id: trailing-whitespace
33+
- id: check-ast
34+
- id: check-docstring-first
35+
- repo: https://github.com/adrienverge/yamllint.git
36+
rev: v1.35.1
37+
hooks:
38+
- id: yamllint
39+
- repo: https://github.com/astral-sh/ruff-pre-commit
40+
rev: v0.7.2
41+
hooks:
42+
# Run the linter.
43+
- id: ruff
44+
types_or: [python, jupyter]
45+
args:
46+
- --fix
47+
# Run the formatter.
48+
- id: ruff-format
49+
types_or: [python, jupyter]
50+
ci:
51+
autoupdate_schedule: monthly

.readthedocs.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1+
---
12
version: 2
2-
33
build:
44
image: latest
5-
65
python:
76
version: 3.8
8-
97
conda:
108
environment: docs/rtd_environment.yml

0 commit comments

Comments
 (0)