Skip to content

Commit 0dd412f

Browse files
authored
Merge branch 'main' into main
2 parents 8117795 + 77fb4ea commit 0dd412f

File tree

107 files changed

+5446
-2040
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+5446
-2040
lines changed

.codecov.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ coverage:
44
status:
55
project:
66
default:
7-
target: 90%
7+
target: 95%
88
patch:
99
default:
10-
target: 90%
10+
target: 95%
1111

12-
comment: off
12+
comment: false

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: monthly
7+
open-pull-requests-limit: 1
8+
groups:
9+
action-dependencies:
10+
patterns:
11+
- "*" # A wildcard to create one PR for all dependencies in the ecosystem

.github/workflows/build.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,15 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
14+
1415
- name: Set up Python
15-
uses: actions/setup-python@v4
16+
uses: actions/setup-python@v5
1617
with:
17-
python-version: "3.10"
18-
- run: pip install tox
18+
python-version: "3.13"
19+
20+
- name: install tests dependencies
21+
run: python -m pip install tox
1922

2023
- name: Test build integrity
2124
run: tox -e build

.github/workflows/docs.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ jobs:
1111
build:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
15+
1516
- name: setup Python
16-
uses: actions/setup-python@v4
17+
uses: actions/setup-python@v5
1718
with:
18-
python-version: "3.10"
19-
- name: install dependencies
20-
run: |
21-
python -m pip install tox
19+
python-version: "3.13"
20+
21+
- name: install tests dependencies
22+
run: python -m pip install tox
23+
2224
- name: build documentation
2325
run: tox -e docs

.github/workflows/lint.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ jobs:
99
runs-on: ubuntu-latest
1010

1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
13+
1314
- name: Set up Python
14-
uses: actions/setup-python@v4
15+
uses: actions/setup-python@v5
1516
with:
16-
python-version: "3.10"
17-
- run: pip install tox
17+
python-version: "3.13"
18+
19+
- name: install tests dependencies
20+
run: python -m pip install tox
1821

1922
- name: Lint the code
2023
run: tox -e lint

.github/workflows/release.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Release
2+
3+
on:
4+
push:
5+
tags: ["*"]
6+
7+
jobs:
8+
build:
9+
name: Build distribution
10+
runs-on: ubuntu-latest
11+
environment:
12+
name: pypi
13+
url: https://pypi.org/project/skmatter
14+
permissions:
15+
id-token: write
16+
contents: write
17+
18+
steps:
19+
- uses: actions/checkout@v4
20+
with:
21+
fetch-depth: 0
22+
- name: setup Python
23+
uses: actions/setup-python@v5
24+
with:
25+
python-version: "3.13"
26+
- run: python -m pip install tox
27+
- name: Build package
28+
run: tox -e build
29+
- name: Publish distribution to PyPI
30+
if: startsWith(github.ref, 'refs/tags/v')
31+
uses: pypa/gh-action-pypi-publish@release/v1
32+
- name: Publish to GitHub release
33+
if: startsWith(github.ref, 'refs/tags/v')
34+
uses: softprops/action-gh-release@v2
35+
with:
36+
files: |
37+
dist/*.tar.gz
38+
dist/*.whl
39+
prerelease: ${{ contains(github.ref, '-rc') }}
40+
env:
41+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,28 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
include:
15-
- os: ubuntu-22.04
16-
python-version: "3.8"
17-
- os: ubuntu-22.04
18-
python-version: "3.11"
19-
- os: macos-11
20-
python-version: "3.8"
21-
- os: macos-11
22-
python-version: "3.11"
23-
- os: windows-2019
24-
python-version: "3.8"
25-
- os: windows-2019
26-
python-version: "3.11"
14+
os: [ubuntu-latest, macos-latest, windows-latest]
15+
python-version: ["3.10", "3.13"]
2716

2817
steps:
29-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
3019

3120
- name: Set up Python ${{ matrix.python-version }}
32-
uses: actions/setup-python@v4
21+
uses: actions/setup-python@v5
3322
with:
3423
python-version: ${{ matrix.python-version }}
35-
- run: pip install tox
24+
25+
- name: install tests dependencies
26+
run: python -m pip install tox coverage[toml]
3627

3728
- name: run Python tests
38-
run: tox -e tests
39-
- uses: codecov/codecov-action@v3
29+
run: |
30+
tox -e tests
31+
coverage xml
32+
33+
- name: upload to codecov.io
34+
uses: codecov/codecov-action@v5
4035
with:
36+
fail_ci_if_error: true
4137
files: ./tests/coverage.xml
38+
token: ${{ secrets.CODECOV_TOKEN }}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
*.coverage*
12
*.pyc
23
*.ipynb_checkpoints*
34
__pycache__
@@ -10,3 +11,4 @@ __pycache__
1011
build/
1112
dist/
1213
docs/src/examples
14+
sg_execution_times.rst

.readthedocs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ version: 2
77

88
# Set the version of Python and other tools we need
99
build:
10-
os: ubuntu-22.04
10+
os: ubuntu-lts-latest
1111
tools:
12-
python: "3.10"
12+
python: "3.13"
1313

1414
# Build documentation in the docs/ directory with Sphinx
1515
sphinx:

CHANGELOG

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,26 @@ The rules for CHANGELOG file:
1313

1414
0.3.0 (XXXX/XX/XX)
1515
------------------
16+
- Add ``_BasePCov`` class (#248)
17+
- Add ``PCovC`` class that inherits shared functionality from ``_BasePCov`` (#248)
18+
- Add ``PCovC`` testing suite and examples (#248)
19+
- Modify ``PCovR`` to inherit shared functionality from ``_BasePCov_`` (#248)
20+
- Update to sklearn >= 1.6.0 and scipy >= 1.15.0 (#239)
21+
- Fixed moved function import from scipy and bump scipy dependency to 1.15.0 (#236)
22+
- Fix rendering issues for `SparseKDE` and `QuickShift` (#236)
23+
- Updating ``FPS`` to allow a numpy array of ints as an initialize parameter (#145)
24+
- Supported Python versions are now ranging from 3.9 - 3.12.
25+
- Updating ``skmatter.datasets`` submodule to support sklearn 1.5.0 (#229)
26+
- Add `SparseKDE` class (#222)
27+
- Add `QuickShift` class (#222)
28+
- Add an example on how to conduct PAMM algorithm with `SparseKDE` and `QuickShift`
29+
(#222)
30+
- Add H2O-BLYP-Piglet dataset (#222)
31+
- Add two distance metrics that support the periodic boundry condition,
32+
`periodic_pairwise_euclidean_distances` and `pairwise_mahalanobis_distances` (#222)
1633

1734
0.2.0 (2023/08/24)
1835
------------------
19-
2036
- Add this ``CHANGELOG`` file (#198)
2137
- Update example of WHO feature selection (#212)
2238
- Rename ``RidgeRegression2FoldCV`` -> ``Ridge2FoldCV`` (#211)
@@ -40,14 +56,12 @@ The rules for CHANGELOG file:
4056

4157
0.1.4 (2023/03/14)
4258
------------------
43-
4459
- documentation formatting fixes for math and datasets (#161, #163)
4560
- changing the way the distance to the convex hull is computed in the
4661
``DirectionalConvexHull`` due to numerical issues with the old method (#165)
4762

4863
0.1.3 (2023/03/02)
4964
------------------
50-
5165
- Refactor ``scikit-cosmo`` to ``scikit-matter`` (#157, #151)
5266
- Deprecation warning was added to link to renamed package (#154)
5367
- dropped Python `<3.8` support, because we are now using ``scikit-learn`` version
@@ -62,7 +76,6 @@ The rules for CHANGELOG file:
6276

6377
0.1.2 (2022/07/04)
6478
------------------
65-
6679
- fixed a bug in the orthonormalization step of ``PCov-CUR`` (#118)
6780
- users can now initialize ``FPS`` selecting using a list of selected points, allowing
6881
to restart the selection in the middle (#116)
@@ -71,15 +84,13 @@ The rules for CHANGELOG file:
7184

7285
0.1.1 (2021/11/30)
7386
------------------
74-
7587
- fixed a bug in the ``orthonormalization`` step of ``PCov-CUR`` (#118)
7688
- users can now initialize ``FPS`` selecting using a list of selected points, allowing to
7789
restart the selection in the middle (#116)
7890
- KPCovR is now able to use pre-fitted regressor in the same way that ``PCovR`` can (#113)
7991

8092
0.1.0 (2021/05/12)
8193
------------------
82-
8394
- first release out of the lab
8495

8596
.. inclusion-marker-changelog-end

0 commit comments

Comments
 (0)