Skip to content

Commit ef37f55

Browse files
committed
Merge branch 'main' into test-suite
2 parents f632e32 + 0db17b9 commit ef37f55

File tree

14 files changed

+377
-178
lines changed

14 files changed

+377
-178
lines changed

.github/dependabot.yml

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,20 @@
11
version: 2
22
updates:
3-
- package-ecosystem: pip
4-
directory: "/"
5-
schedule:
6-
interval: daily
7-
open-pull-requests-limit: 10
8-
labels:
9-
- dependencies
10-
ignore:
11-
- dependency-name: black
12-
versions:
13-
- 21.4b0
14-
- 21.4b1
15-
- dependency-name: pylint
16-
versions:
17-
- 2.7.1
18-
- 2.8.1
19-
- 2.8.2
20-
- dependency-name: pyarrow
21-
versions:
22-
- 4.0.0
23-
- dependency-name: nbsphinx
24-
versions:
25-
- 0.8.3
26-
- dependency-name: pytorch-lightning
27-
versions:
28-
- 1.2.0
29-
- 1.2.10
30-
- 1.2.8
31-
- 1.2.9
32-
- dependency-name: flake8
33-
versions:
34-
- 3.9.1
35-
- dependency-name: pydata-sphinx-theme
36-
versions:
37-
- 0.6.0
38-
- 0.6.1
39-
- 0.6.2
3+
- package-ecosystem: "pip"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
commit-message:
8+
prefix: "[MNT] [Dependabot]"
9+
include: "scope"
10+
labels:
11+
- "maintenance"
12+
- package-ecosystem: "github-actions"
13+
directory: "/"
14+
schedule:
15+
interval: "daily"
16+
commit-message:
17+
prefix: "[MNT] [Dependabot]"
18+
include: "scope"
19+
labels:
20+
- "maintenance"
File renamed without changes.
File renamed without changes.

.github/workflows/lint.yml

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/workflows/pypi_release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ jobs:
7272
runs-on: ubuntu-latest
7373
needs: [pytest-nosoftdeps]
7474

75+
permissions:
76+
id-token: write
77+
7578
steps:
7679
- uses: actions/download-artifact@v4
7780
with:
@@ -81,5 +84,4 @@ jobs:
8184
- name: Publish package to PyPI
8285
uses: pypa/gh-action-pypi-publish@release/v1
8386
with:
84-
password: ${{ secrets.PYPI_API_TOKEN }}
8587
packages-dir: wheelhouse/

.github/workflows/test.yml

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,47 @@ concurrency:
1414
cancel-in-progress: true
1515

1616
jobs:
17+
code-quality:
18+
name: code-quality
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: repository checkout step
22+
uses: actions/checkout@v4
23+
24+
- name: python environment step
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: "3.11"
28+
29+
- name: install pre-commit
30+
run: python3 -m pip install pre-commit
31+
32+
- name: Checkout code
33+
uses: actions/checkout@v4
34+
with:
35+
fetch-depth: 0
36+
37+
- name: Get changed files
38+
id: changed-files
39+
run: |
40+
CHANGED_FILES=$(git diff --name-only ${{ github.event.pull_request.base.sha }} ${{ github.sha }} | tr '\n' ' ')
41+
echo "CHANGED_FILES=${CHANGED_FILES}" >> $GITHUB_ENV
42+
43+
- name: Print changed files
44+
run: |
45+
echo "Changed files:" && echo "$CHANGED_FILES" | tr ' ' '\n'
46+
47+
- name: Run pre-commit on changed files
48+
run: |
49+
if [ -n "$CHANGED_FILES" ]; then
50+
pre-commit run --color always --files $CHANGED_FILES --show-diff-on-failure
51+
else
52+
echo "No changed files to check."
53+
fi
54+
1755
run-notebook-tutorials:
56+
name: Run notebook tutorials
57+
needs: code-quality
1858
runs-on: ubuntu-latest
1959
steps:
2060
- uses: actions/checkout@v4
@@ -36,6 +76,7 @@ jobs:
3676

3777
pytest-nosoftdeps:
3878
name: no-softdeps
79+
needs: code-quality
3980
runs-on: ${{ matrix.os }}
4081
strategy:
4182
fail-fast: false
@@ -75,6 +116,7 @@ jobs:
75116

76117
pytest:
77118
name: Run pytest
119+
needs: pytest-nosoftdeps
78120
runs-on: ${{ matrix.os }}
79121
strategy:
80122
fail-fast: false
@@ -119,7 +161,7 @@ jobs:
119161
coverage xml
120162
121163
- name: Upload coverage to Codecov
122-
uses: codecov/codecov-action@v1
164+
uses: codecov/codecov-action@v5
123165
if: always()
124166
continue-on-error: true
125167
with:

docs/source/getting-started.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,11 @@ Otherwise, you can proceed with
2323
2424
2525
Alternatively, to install the package via ``conda``:
26-
2726
.. code-block:: bash
2827
2928
conda install pytorch-forecasting pytorch>=1.7 -c pytorch -c conda-forge
3029
31-
PyTorch Forecasting is now installed from the conda-forge channel while PyTorch is install from the pytorch channel.
30+
PyTorch Forecasting is now installed from the conda-forge channel while PyTorch is installed from the pytorch channel.
3231

3332
To use the MQF2 loss (multivariate quantile loss), also install
3433

@@ -54,7 +53,7 @@ The general setup for training and testing a model is
5453
Similarly, a test dataset or later a dataset for inference can be created. You can store the dataset parameters
5554
directly if you do not wish to load the entire training dataset at inference time.
5655

57-
#. Instantiate a model using the its ``.from_dataset()`` method.
56+
#. Instantiate a model using the ``.from_dataset()`` method.
5857
#. Create a ``lightning.Trainer()`` object.
5958
#. Find the optimal learning rate with its ``.tuner.lr_find()`` method.
6059
#. Train the model with early stopping on the training dataset and use the tensorboard logs
@@ -65,7 +64,7 @@ The general setup for training and testing a model is
6564
#. Load the model from the model checkpoint and apply it to new data.
6665

6766

68-
The :ref:`Tutorials <tutorials>` section provides detailled guidance and examples on how to use models and implement new ones.
67+
The :ref:`Tutorials <tutorials>` section provides detailed guidance and examples on how to use models and implement new ones.
6968

7069

7170
Example

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ dev = [
107107

108108
# docs - dependencies for building the documentation
109109
docs = [
110-
"sphinx>3.2,<7.2.6",
110+
"sphinx>3.2,<8.2.4",
111111
"pydata-sphinx-theme",
112112
"nbsphinx",
113113
"pandoc",

0 commit comments

Comments
 (0)