Skip to content

Commit dab6bb2

Browse files
committed
Merge branch 'update-readme-docs' of https://github.com/Ouranosinc/xsdba into update-readme-docs
2 parents a126842 + e510476 commit dab6bb2

17 files changed

+1615
-2759
lines changed

.cruft.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "https://github.com/Ouranosinc/cookiecutter-pypackage",
3-
"commit": "f750ad2185cbb56df6f7e98a269bdd8399283ea8",
3+
"commit": "b27c2d5f8126ea1aefae29a6f5ccfdafad96395d",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {

.github/workflows/bump-version.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
pypi.org:443
5858
- name: Generate App Token
5959
id: token_generator
60-
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
60+
uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
6161
with:
6262
app-id: ${{ secrets.OURANOS_HELPER_BOT_ID }}
6363
private-key: ${{ secrets.OURANOS_HELPER_BOT_KEY }}

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
run: |
7777
python -m pip install --require-hashes -r CI/requirements_ci.txt
7878
- name: Environment Caching
79-
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
79+
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
8080
with:
8181
path: .tox
8282
key: ${{ matrix.os }}-Python${{ matrix.python-version }}-${{ hashFiles('pyproject.toml', 'tox.ini') }}
@@ -108,7 +108,7 @@ jobs:
108108
- name: Checkout Repository
109109
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
110110
- name: Setup Conda (Micromamba) with Python${{ matrix.python-version }}
111-
uses: mamba-org/setup-micromamba@06375d89d211a1232ef63355742e9e2e564bc7f7 # v2.0.2
111+
uses: mamba-org/setup-micromamba@068f1ab4b37ed9b3d9f73da7db90a0cda0a48d29 # v2.0.3
112112
with:
113113
cache-downloads: true
114114
cache-environment: true

.github/workflows/publish-pypi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ jobs:
4141
run: |
4242
python -m flit build
4343
- name: Publish distribution 📦 to PyPI
44-
uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2
44+
uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70 # v1.12.3

.github/workflows/scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ jobs:
7272
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
7373
# format to the repository Actions tab.
7474
- name: Upload Artifact
75-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
75+
uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
7676
with:
7777
name: SARIF file
7878
path: results.sarif
7979
retention-days: 5
8080

8181
# Upload the results to GitHub's code scanning dashboard.
8282
- name: Upload to code-scanning
83-
uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # 3.27.5
83+
uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # 3.28.0
8484
with:
8585
sarif_file: results.sarif

.github/workflows/tag-testpypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Checkout Repository
2424
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2525
- name: Create Release
26-
uses: softprops/action-gh-release@01570a1f39cb168c169c802c3bceb9e93fb10974 # 2.1.0
26+
uses: softprops/action-gh-release@7b4da11513bf3f43f9999e90eabced41ab8bb048 # 2.2.0
2727
env:
2828
# This token is provided by Actions, you do not need to create your own token
2929
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -65,7 +65,7 @@ jobs:
6565
run: |
6666
python -m flit build
6767
- name: Publish distribution 📦 to Test PyPI
68-
uses: pypa/gh-action-pypi-publish@15c56dba361d8335944d31a2ecd17d700fc7bcbc # v1.12.2
68+
uses: pypa/gh-action-pypi-publish@67339c736fd9354cd4f8cb0b744f2b82a74b5c70 # v1.12.3
6969
with:
7070
repository-url: https://test.pypi.org/legacy/
7171
skip-existing: true

.pre-commit-config.yaml

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ default_language_version:
33

44
repos:
55
- repo: https://github.com/asottile/pyupgrade
6-
rev: v3.19.0
6+
rev: v3.19.1
77
hooks:
88
- id: pyupgrade
9-
args: [ '--py39-plus' ]
9+
args: [ '--py310-plus' ]
1010
- repo: https://github.com/pre-commit/pre-commit-hooks
1111
rev: v5.0.0
1212
hooks:
@@ -16,6 +16,7 @@ repos:
1616
- id: check-json
1717
- id: pretty-format-json
1818
args: [ '--autofix', '--no-ensure-ascii', '--no-sort-keys' ]
19+
exclude: '.ipynb'
1920
- id: check-toml
2021
- id: check-yaml
2122
args: [ '--allow-multiple-documents' ]
@@ -42,7 +43,7 @@ repos:
4243
- id: isort
4344
exclude: ^docs/
4445
- repo: https://github.com/astral-sh/ruff-pre-commit
45-
rev: v0.8.1
46+
rev: v0.8.6
4647
hooks:
4748
- id: ruff
4849
args: [ '--fix' ]
@@ -53,6 +54,24 @@ repos:
5354
- id: flake8
5455
additional_dependencies: [ 'flake8-rst-docstrings' ]
5556
args: [ '--config=.flake8' ]
57+
- repo: https://github.com/jendrikseipp/vulture
58+
rev: 'v2.13'
59+
hooks:
60+
- id: vulture
61+
- repo: https://github.com/nbQA-dev/nbQA
62+
rev: 1.9.1
63+
hooks:
64+
- id: nbqa-pyupgrade
65+
args: [ '--py310-plus' ]
66+
additional_dependencies: [ 'pyupgrade==3.19.0' ]
67+
- id: nbqa-black
68+
additional_dependencies: [ 'black==24.10.0' ]
69+
- repo: https://github.com/kynan/nbstripout
70+
rev: 0.8.1
71+
hooks:
72+
- id: nbstripout
73+
files: '.ipynb'
74+
args: [ '--extra-keys=metadata.kernelspec' ]
5675
- repo: https://github.com/keewis/blackdoc
5776
rev: v0.3.9
5877
hooks:

CHANGELOG.rst

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@ Contributors: Éric Dupuis (:user:`coxipi`), Trevor James Smith (:user:`Zeitsper
99

1010
Changes
1111
^^^^^^^
12-
* Split `sdba` from `xclim` and duplicate code where needed. (:pull:`8`)
13-
* `units` are a copy (or almost) of given modules in `xclim`. A lot of duplicated code from xclim's `calendar` is also in xsdba's `base`. (:pull:`8`)
14-
12+
* Split `sdba` from `xclim` into its own standalone package. Where needed, some common functionalities were duplicated: (:pull:`8`)
13+
* ``xsdba.units`` is an adaptation of the ``xclim.core.units`` modules.
14+
* Many functions and definitions found in ``xclim.core.calendar`` have been adapted to ``xsdba.base``.
15+
* Dependencies have been updated to reflect the new package structure. (:pull:`45`)
16+
* Updated documentation configuration: (:pull:`46`)
17+
* Significant improvements to the documentation content and layout.
18+
* Now using the `furo` theme for `sphinx`.
19+
* Notebooks are now linted and formatted with `nbstripout` and `nbqa-black`.
20+
* CSS configurations have been added for better rendering of the documentation and logos.
21+
* Added the `vulture` linter (for identifying dead code) to the pre-commit configuration. (:pull:`46`).
1522

1623
.. _changes_0.1.0:
1724

CI/requirements_ci.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
bump-my-version==0.28.1
1+
bump-my-version==0.29.0
22
coveralls==4.0.1
33
pip==24.3.1
4-
flit==3.9.0
4+
flit==3.10.1
55
tox==4.23.2
66
tox-gh==1.4.4

CI/requirements_ci.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ bracex==2.4 \
1212
--hash=sha256:a27eaf1df42cf561fed58b7a8f3fdf129d1ea16a81e1fadd1d17989bc6384beb \
1313
--hash=sha256:efdc71eff95eaff5e0f8cfebe7d01adf2c8637c8c92edaf63ef348c241a82418
1414
# via wcmatch
15-
bump-my-version==0.28.1 \
16-
--hash=sha256:df7fdb02a1b43c122a6714df6d1fe4efc7a1220b5638ca5a0eb3018813c1b222 \
17-
--hash=sha256:e608def5191baf505b6cde88bd679a0a95fc4cfeace4247adb60ac0f8a7e57ee
15+
bump-my-version==0.29.0 \
16+
--hash=sha256:6566ab25bd3eeeec109f4ac7e4464227a3ac1fd57f847d259a24800423cd9037 \
17+
--hash=sha256:e4149ed63b4772f5868b3fcabb8fa5e1191b8abae6d35effd0be980d4b0f55e3
1818
# via -r CI/requirements_ci.in
1919
cachetools==5.5.0 \
2020
--hash=sha256:02134e8439cdc2ffb62023ce1debca2944c3f289d66bb17ead3ab3dede74b292 \

0 commit comments

Comments
 (0)