Skip to content

Commit 2469350

Browse files
authored
Merge branch 'main' into main
2 parents 0dd412f + 575cb8f commit 2469350

Some content is hidden

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

49 files changed

+2024
-421
lines changed

.codecov.yml

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

1212
comment: false

.github/workflows/tests-dev.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Tests dev
2+
3+
on:
4+
schedule:
5+
# check once a week on mondays
6+
- cron: '0 10 * * 1'
7+
8+
jobs:
9+
tests-dev:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
python-version: ["3.10", "3.13"]
14+
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- name: Set up Python ${{ matrix.python-version }}
19+
uses: actions/setup-python@v5
20+
with:
21+
python-version: ${{ matrix.python-version }}
22+
23+
- name: Install tests dependencies
24+
run: python -m pip install tox
25+
26+
- name: Run tests against scikit-learn dev version
27+
run: tox -e tests-dev

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
with:
2323
python-version: ${{ matrix.python-version }}
2424

25-
- name: install tests dependencies
25+
- name: Install tests dependencies
2626
run: python -m pip install tox coverage[toml]
2727

28-
- name: run Python tests
28+
- name: Run Python tests
2929
run: |
3030
tox -e tests
3131
coverage xml

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ __pycache__
66
*.swp
77
*.swo
88
*DS_Store
9+
_version.py
910

1011
.tox/
1112
build/

CHANGELOG

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,23 @@ The rules for CHANGELOG file:
1111

1212
.. inclusion-marker-changelog-start
1313

14-
0.3.0 (XXXX/XX/XX)
14+
0.3.1 (2025/06/30)
15+
------------------
16+
- Fix typos and make minor edits to ``PCovC`` and ``KPCovR`` docs (#254)
17+
- Fix ``assertTrue`` typos in ``KPCovR`` testing suite (#254)
18+
- Add ``KernelPCovC`` class and examples (#254)
19+
20+
0.3.0 (2025/06/12)
1521
------------------
1622
- Add ``_BasePCov`` class (#248)
1723
- Add ``PCovC`` class that inherits shared functionality from ``_BasePCov`` (#248)
1824
- 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)
25+
- Modify ``PCovR`` to inherit shared functionality from ``_BasePCov`` (#248)
26+
- Update to sklearn >= 1.7.0 and scipy >= 1.15.0 (#239, #257)
2127
- Fixed moved function import from scipy and bump scipy dependency to 1.15.0 (#236)
2228
- Fix rendering issues for `SparseKDE` and `QuickShift` (#236)
2329
- 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.
30+
- Supported Python versions are now ranging from 3.9 - 3.13.
2531
- Updating ``skmatter.datasets`` submodule to support sklearn 1.5.0 (#229)
2632
- Add `SparseKDE` class (#222)
2733
- Add `QuickShift` class (#222)

CITATION.cff

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
cff-version: 1.2.0
2+
message: "If you use scikit-matter for your work, please read and cite it as below."
3+
title: >-
4+
scikit-matter : a suite of generalisable machine learning methods born out of chemistry and materials science [version 2; peer review: 3 approved, 1 approved with reservations]
5+
type: journalArticle
6+
issue: 81
7+
volume: 3
8+
authors:
9+
- family-names: Goscinski
10+
given-names: Alexander
11+
- family-names: Principe
12+
given-names: Victor P.
13+
- family-names: Fraux
14+
given-names: Guillaume
15+
- family-names: Kliavinek
16+
given-names: Sergei
17+
- family-names: Helfrecht
18+
given-names: Benjamin A.
19+
- family-names: Loche
20+
given-names: Philip
21+
- family-names: Ceriotti
22+
given-names: Michele
23+
- family-names: Cersonsky
24+
given-names: Rose K.
25+
date-published: 2023
26+
identifiers:
27+
- type: doi
28+
value: 10.12688/openreseurope.15789.2

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
graft src
22

33
include LICENSE
4+
include CITATION.cff
45
include README.rst
56

67
prune docs

README.rst

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
scikit-matter
22
=============
3-
|tests| |codecov| |pypi| |conda| |docs| |doi|
3+
4+
|tests| |codecov| |pypi| |conda| |docs-stable| |docs-latest| |doi|
45

56
A collection of ``scikit-learn`` compatible utilities that implement methods born out of
67
the materials science and chemistry communities.
78

8-
For details, tutorials, and examples, please have a look at our `documentation`_.
9+
For details, tutorials, and examples, please have a look at our documentation_. We also
10+
provide a `latest documentation`_ from the current unreleased development version.
911

10-
.. _`documentation`: https://scikit-matter.readthedocs.io
12+
.. _`documentation`: https://scikit-matter.readthedocs.io/en/v0.3.1/
13+
.. _`latest documentation`: https://scikit-matter.readthedocs.io/en/latest
1114

1215
.. marker-installation
1316
@@ -98,9 +101,13 @@ Thanks goes to all people that make scikit-matter possible:
98101
:alt: Code coverage
99102
:target: https://codecov.io/gh/scikit-learn-contrib/scikit-matter/
100103

101-
.. |docs| image:: https://img.shields.io/badge/documentation-latest-sucess
102-
:alt: Python
103-
:target: documentation_
104+
.. |docs-stable| image:: https://img.shields.io/badge/📚_Documentation-stable-sucess
105+
:alt: Documentation of stable released version
106+
:target: `documentation`_
107+
108+
.. |docs-latest| image:: https://img.shields.io/badge/📒_Documentation-latest-yellow.svg
109+
:alt: Documentation of latest unreleased version
110+
:target: `latest documentation`_
104111

105112
.. |pypi| image:: https://img.shields.io/pypi/v/skmatter.svg
106113
:alt: Latest PYPI version

docs/src/contributing.rst

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,3 +212,49 @@ properly. It should look something like this:
212212
213213
You're good to go! Time to submit a `pull request.
214214
<https://github.com/lab-cosmo/scikit-matter/pulls>`_
215+
216+
How to Perform a Release
217+
-------------------------
218+
219+
1. **Prepare a Release Pull Request**
220+
221+
- Based on the main branch create branch ``release-x.y.z`` and a PR.
222+
- Ensure that all `CI tests
223+
<https://github.com/scikit-learn-contrib/scikit-matter/actions>`_ pass.
224+
- Optionally, run the tests locally to double-check.
225+
226+
2. **Update the Changelog**
227+
228+
- Edit the changelog located in ``CHANGELOG``:
229+
- Add a new section for the new version, summarizing the changes based on the
230+
PRs merged since the last release.
231+
- Leave a placeholder section titled *Unreleased* for future updates.
232+
233+
3. **Merge the PR and Create a Tag**
234+
235+
- Merge the release PR.
236+
- Update the ``main`` branch and check that the latest commit is the release PR with
237+
``git log``
238+
- Create a tag on directly the ``main`` branch.
239+
- Push the tag to GitHub. For example for a release of version ``x.y.z``:
240+
241+
.. code-block:: bash
242+
243+
git checkout main
244+
git pull
245+
git tag -a vx.y.z -m "Release vx.y.z"
246+
git push --tags
247+
248+
4. **Finalize the GitHub Release**
249+
250+
- Once the PR is merged, the CI will automatically:
251+
- Publish the package to PyPI.
252+
- Create a draft release on GitHub.
253+
- Update the GitHub release notes by pasting the changelog for the version.
254+
255+
5. **Merge Conda Recipe Changes**
256+
257+
- May resolve and then merge an automatically created PR on the `conda recipe
258+
<https://github.com/conda-forge/skmatter-feedstock>`_.
259+
- Once thus PR is merged and the new version will be published automatically on the
260+
`conda-forge <https://anaconda.org/conda-forge/skmatter>`_ channel.

docs/src/index.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
.. automodule:: skmatter
22

3+
.. raw:: html
4+
5+
<style>
6+
/* Overriding bootstrap font color so that text appears white
7+
in dark theme */
8+
html[data-theme="dark"] .card-text {
9+
color: var(--pst-color-text-base);
10+
}
11+
12+
/* Overriding bootstrap border color so that border appears white
13+
in dark theme */
14+
html[data-theme="dark"] .card {
15+
--bs-card-border-color: var(--pst-color-border);
16+
}
17+
</style>
18+
319
.. raw:: html
420

521
<div class="container">

0 commit comments

Comments
 (0)