Skip to content

Commit 404c2bf

Browse files
Refactor skcosmo to skmatter
* changes all instances of 'scikit-cosmo' and 'scikit-COSMO' to 'scikit-matter' * changes instances of 'skcosmo' to 'skmatter' * changes all instances of 'SKCOSMO' to 'SKMATTER' * changes hyperlinks containing 'scikit-cosmo' to 'scikit-matter', which reflects the change in the github link and repo name after refactoring. * renames base directory skcosmo to skmatter. * changed descriptions of scikitmatter away from the COSMO lab.
1 parent dd9a36a commit 404c2bf

File tree

89 files changed

+183
-196
lines changed

Some content is hidden

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

89 files changed

+183
-196
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ jobs:
3333
black --check .
3434
- name: Check imports
3535
run: |
36-
isort skcosmo/*/*py -m 3 --tc --fgw --up -e -l 88 --check
36+
isort skmatter/*/*py -m 3 --tc --fgw --up -e -l 88 --check

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2020 the sklearn-cosmo contributors
3+
Copyright (c) 2020 the sklearn-matter contributors
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

MANIFEST.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
recursive-include skcosmo/datasets/data/ *
2-
recursive-include skcosmo/datasets/descr/ *
1+
recursive-include skmatter/datasets/data/ *
2+
recursive-include skmatter/datasets/descr/ *

README.md

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
# scikit-cosmo
1+
# scikit-matter
22

3-
[![Test](https://github.com/lab-cosmo/scikit-cosmo/workflows/Test/badge.svg)](https://github.com/lab-cosmo/scikit-cosmo/actions?query=workflow%3ATest)
4-
[![codecov](https://codecov.io/gh/lab-cosmo/scikit-cosmo/branch/main/graph/badge.svg?token=UZJPJG34SM)](https://codecov.io/gh/lab-cosmo/scikit-cosmo/)
3+
[![Test](https://github.com/lab-cosmo/scikit-matter/workflows/Test/badge.svg)](https://github.com/lab-cosmo/scikit-matter/actions?query=workflow%3ATest)
4+
[![codecov](https://codecov.io/gh/lab-cosmo/scikit-matter/branch/main/graph/badge.svg?token=UZJPJG34SM)](https://codecov.io/gh/lab-cosmo/scikit-matter/)
55

66
A collection of scikit-learn compatible utilities that implement methods
7-
developed in the COSMO laboratory
8-
9-
10-
## Deprecation Warning
11-
__IMPORTANT:__ This package has been renamed to scikit-matter ([skmatter](https://github.com/lab-cosmo/scikit-matter)). This package will no longer be maintained and updated.
12-
13-
Please install the new package, skmatter, using:
7+
born out of the materials science and chemistry communities.
148

159
```bash
1610
pip install skmatter
@@ -19,10 +13,10 @@ pip install skmatter
1913
## Installation
2014

2115
```bash
22-
pip install skcosmo
16+
pip install skmatter
2317
```
2418

25-
You can then `import skcosmo` in your code!
19+
You can then `import skmatter` in your code!
2620

2721
## Developing the package
2822

@@ -35,8 +29,8 @@ pip install tox black flake8
3529
Then this package itself
3630

3731
```bash
38-
git clone https://github.com/lab-cosmo/scikit-cosmo
39-
cd scikit-cosmo
32+
git clone https://github.com/lab-cosmo/scikit-matter
33+
cd scikit-matter
4034
pip install -e .
4135
```
4236

@@ -46,7 +40,7 @@ and allowing you to edit the code and directly use the updated version.
4640
### Running the tests
4741

4842
```bash
49-
cd <scikit-cosmo PATH>
43+
cd <scikit-matter PATH>
5044
# run unit tests
5145
tox
5246
# run the code formatter

docs/source/conf.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,19 @@
5353
converted = exporter.from_filename(nb_in)[0]
5454
out_stream.write(converted)
5555

56-
import skcosmo # noqa
56+
import skmatter # noqa
5757

5858
# -- Project information -----------------------------------------------------
5959

6060
# The master toctree document.
6161
master_doc = "index"
6262

63-
project = "scikit-COSMO"
63+
project = "scikit-matter"
6464
author = ", ".join(open(os.path.join(ROOT, "contributors.txt")))
6565
copyright = "2020, " + author
6666

6767
# The full version, including alpha/beta/rc tags
68-
release = skcosmo.__version__
68+
release = skmatter.__version__
6969

7070

7171
# -- General configuration ---------------------------------------------------
@@ -188,7 +188,7 @@
188188
# html_search_scorer = 'scorer.js'
189189

190190
# Output file base name for HTML help builder.
191-
htmlhelp_basename = "skcosmodoc"
191+
htmlhelp_basename = "skmatterdoc"
192192

193193
# -- Options for LaTeX output ---------------------------------------------
194194

@@ -207,7 +207,7 @@
207207
# (source start file, target name, title,
208208
# author, documentclass [howto, manual, or own class]).
209209
latex_documents = [
210-
(master_doc, "skcosmo.tex", "scikit-COSMO Documentation", author, "manual"),
210+
(master_doc, "skmatter.tex", "scikit-matter Documentation", author, "manual"),
211211
]
212212

213213
# The name of an image file (relative to this directory) to place at the top of

docs/source/contributing.rst

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Then this package itself
1414

1515
.. code-block:: bash
1616
17-
git clone https://github.com/lab-cosmo/scikit-cosmo
18-
cd scikit-cosmo
17+
git clone https://github.com/lab-cosmo/scikit-matter
18+
cd scikit-matter
1919
pip install -e .
2020
2121
This install the package in development mode, making it importable globally
@@ -26,7 +26,7 @@ Running the tests
2626

2727
.. code-block:: bash
2828
29-
cd <scikit-cosmo PATH>
29+
cd <scikit-matter PATH>
3030
# run unit tests
3131
tox
3232
# run the code formatter
@@ -43,20 +43,20 @@ editors <https://black.readthedocs.io/en/stable/editor_integration.html>`_.
4343
Issues and Pull Requests
4444
########################
4545

46-
Having a problem with scikit-COSMO? Please let us know by `submitting an issue <https://github.com/lab-cosmo/scikit-cosmo/issues>`_.
46+
Having a problem with scikit-matter? Please let us know by `submitting an issue <https://github.com/lab-cosmo/scikit-matter/issues>`_.
4747

48-
Submit new features or bug fixes through a `pull request <https://github.com/lab-cosmo/scikit-cosmo/pulls>`_.
48+
Submit new features or bug fixes through a `pull request <https://github.com/lab-cosmo/scikit-matter/pulls>`_.
4949

5050

5151
Contributing Datasets
5252
#####################
5353

54-
Have an example dataset that would fit into scikit-COSMO?
54+
Have an example dataset that would fit into scikit-matter?
5555

5656
Contributing a dataset is easy. First, copy your numpy file into
57-
``skcosmo/datasets/data/`` with an informative name. Here, we'll call it ``my-dataset.npz``.
57+
``skmatter/datasets/data/`` with an informative name. Here, we'll call it ``my-dataset.npz``.
5858

59-
Next, create a documentation file in ``skcosmo/datasets/data/my-dataset.rst``.
59+
Next, create a documentation file in ``skmatter/datasets/data/my-dataset.rst``.
6060
This file should look like this:
6161

6262
.. code-block::
@@ -71,7 +71,7 @@ This file should look like this:
7171
Function Call
7272
-------------
7373
74-
.. function:: skcosmo.datasets.load_my_dataset
74+
.. function:: skmatter.datasets.load_my_dataset
7575
7676
Data Set Characteristics
7777
------------------------
@@ -100,8 +100,8 @@ This file should look like this:
100100
--------------
101101
102102
103-
Then, show ``scikit-cosmo`` how to load your data by adding a loader function to
104-
``skcosmo/datasets/_base.py``. It should look like this:
103+
Then, show ``scikit-matter`` how to load your data by adding a loader function to
104+
``skmatter/datasets/_base.py``. It should look like this:
105105

106106
.. code-block:: python
107107
@@ -132,9 +132,9 @@ Then, show ``scikit-cosmo`` how to load your data by adding a loader function to
132132
133133
return Bunch(data=data, DESCR=fdescr)
134134
135-
Add this function to ``skcosmo/datasets/__init__.py``.
135+
Add this function to ``skmatter/datasets/__init__.py``.
136136

137-
Finally, add a test to ``skcosmo/tests/test_datasets.py`` to see that your dataset
137+
Finally, add a test to ``skmatter/tests/test_datasets.py`` to see that your dataset
138138
loads properly. It should look something like this:
139139

140140
.. code-block:: python
@@ -152,7 +152,7 @@ loads properly. It should look something like this:
152152
self.my_data.DESCR
153153
154154
155-
You're good to go! Time to submit a `pull request. <https://github.com/lab-cosmo/scikit-cosmo/pulls>`_
155+
You're good to go! Time to submit a `pull request. <https://github.com/lab-cosmo/scikit-matter/pulls>`_
156156

157157

158158
License

docs/source/datasets.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Datasets
22
========
33

4-
.. include:: ../../skcosmo/datasets/descr/degenerate_CH4_manifold.rst
4+
.. include:: ../../skmatter/datasets/descr/degenerate_CH4_manifold.rst
55

6-
.. include:: ../../skcosmo/datasets/descr/csd-1000r.rst
6+
.. include:: ../../skmatter/datasets/descr/csd-1000r.rst
77

docs/source/gfrm.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Reconstruction Measures
44
======================================
55

6-
.. currentmodule:: skcosmo.metrics
6+
.. currentmodule:: skmatter.metrics
77

88

99
.. _GRE-api:

docs/source/index.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
scikit-cosmo documentation
1+
scikit-matter documentation
22
===========================
33

4-
``scikit-cosmo`` is a collection of `scikit-learn <https://scikit.org/>`_
5-
compatible utilities that implement methods developed in the `COSMO laboratory
6-
<https://cosmo.epfl.ch>`_.
4+
``scikit-matter`` is a collection of `scikit-learn <https://scikit.org/>`_
5+
compatible utilities that implement methods born out of the materials science
6+
and chemistry communities.
77

88
Convenient-to-use libraries such as scikit-learn have accelerated the adoption and application
99
of machine learning (ML) workflows and data-driven methods. Such libraries have gained great
@@ -12,10 +12,10 @@ While developments in the atomistic learning community have put forward general-
1212
learning methods, their deployment is commonly entangled with domain-specific functionalities,
1313
preventing access to a wider audience.
1414

15-
scikit-COSMO targets domain-agnostic implementations of methods developed in the
15+
scikit-matter targets domain-agnostic implementations of methods developed in the
1616
computational chemical and materials science community, following the
1717
scikit-learn API and coding guidelines to promote usability and interoperability
18-
with existing workflows. scikit-COSMO contains a toolbox of methods for
18+
with existing workflows. scikit-matter contains a toolbox of methods for
1919
unsupervised and supervised analysis of ML datasets, including the comparison,
2020
decomposition, and selection of features and samples.
2121

docs/source/installation.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
Installation
22
============
33

4-
scikit-COSMO is, by design, relatively lightweight, and only requires that `numpy <numpy.org>`_
4+
scikit-matter is, by design, relatively lightweight, and only requires that `numpy <numpy.org>`_
55
and the most recent release of `scikit-learn <scikit-learn.org>`_ be installed.
66

77
Install from source
88
###################
99

1010
.. code-block:: bash
1111
12-
git clone https://github.com/lab-cosmo/scikit-cosmo
13-
cd scikit-cosmo
12+
git clone https://github.com/lab-cosmo/scikit-matter
13+
cd scikit-matter
1414
python setup.py install --user
1515
16-
You're ready to import skcosmo from your code! Have a look at the :ref:`api-reference` for how to use the code.
16+
You're ready to import skmatter from your code! Have a look at the :ref:`api-reference` for how to use the code.

0 commit comments

Comments
 (0)