Skip to content

Commit d49e83e

Browse files
authored
Updating the documentation (#679)
* Change text for shift from setup.py to pyproject.toml * Adding doi badge * Update README.md text
1 parent b7f4675 commit d49e83e

File tree

2 files changed

+26
-22
lines changed

2 files changed

+26
-22
lines changed

README.md

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,39 @@
77
[![PyPI badge](https://img.shields.io/pypi/v/scivision)](https://pypi.org/project/scivision/)
88
[![All Contributors](https://img.shields.io/github/all-contributors/alan-turing-institute/scivision?color=ee8449)](#contributors)
99
[![Licence badge (BSD 3 Clause)](https://img.shields.io/badge/License-BSD_3--Clause-blue.svg)](https://github.com/alan-turing-institute/scivision/blob/main/LICENSE)
10+
[![DOI](https://zenodo.org/badge/367023884.svg)](https://zenodo.org/doi/10.5281/zenodo.10792860)
1011

1112
If you are new to Scivision, start with the [website](https://sci.vision/).
1213

1314
The Scivision project is building:
1415

15-
- Some things hosted in [this GitHub repository](https://github.com/alan-turing-institute/scivision):
16-
- A **catalog** of community-curated computer vision [models](https://sci.vision/#/model-grid) and [datasets](https://sci.vision/#/datasource-grid) from the sciences and humanities
17-
- A **Python package**, for conveniently downloading and using these models and datasets from Python ([scivision on PyPI](https://pypi.org/project/scivision/))
18-
- **Documentation** for the above ([documentation website](https://scivision.readthedocs.io/en/latest/))
19-
- A [**gallery of notebooks**](https://github.com/scivision-gallery) using Scivision models and datasets
20-
- a **community** of computer vision practitioners in the sciences and humanities
21-
([mailing list](https://scivision.substack.com/), [get Slack invitation](https://docs.google.com/forms/d/e/1FAIpQLSfDPbsb_CWApnodHlNyOQMQdKhKA9meJi_SAuh8K8dVpbIiDA/viewform))
22-
- A (nascent) **ecosystem of computer vision tools and utilities**
16+
- A **community** of computer vision practitioners in the sciences and humanities
17+
([get a Slack invitation](https://docs.google.com/forms/d/e/1FAIpQLSfDPbsb_CWApnodHlNyOQMQdKhKA9meJi_SAuh8K8dVpbIiDA/viewform), [join the mailing list](https://scivision.substack.com/))
18+
- A **catalog** of community-curated computer vision [models](https://sci.vision/#/model-grid) and [datasets](https://sci.vision/#/datasource-grid) from the sciences and humanities
19+
- A software **ecosystem of interoperable tools** and utilities for working with computer vision models and data, including:
20+
- **Scivision.Py**, a Python package for conveniently downloading and using the computer vision models and datasets from Python ([scivision on PyPI](https://pypi.org/project/scivision/))
21+
- **[Pixelflow](https://github.com/alan-turing-institute/pixelflow)**, a tool for extracting information about the characteristics of objects in images
2322

24-
Submit a bug or feature request [here](https://github.com/alan-turing-institute/scivision/issues).
25-
26-
If you would like a link to a model or datasource to be listed in the catalog, such a contribution would be gratefully received. See the [Contributing Guide](https://scivision.readthedocs.io/en/latest/contributing.html) for how to set up and submit a new entry. Pull requests for code changes are also welcome.
23+
Example use cases for these tools can be found in the [**gallery of notebooks**](https://github.com/scivision-gallery) using Scivision models and datasets
2724

28-
The Scivision project is funded by the Alan Turing Institute.
25+
The Scivision project is funded by [the Alan Turing Institute](https://www.turing.ac.uk/).
2926

3027
## Repository contents
3128

32-
The main [project repository on GitHub](https://github.com/alan-turing-institute/scivision) hosts
29+
This main [project repository on GitHub](https://github.com/alan-turing-institute/scivision) hosts
3330
- development of the Python package (in the root directory)
3431
- development of the website (in `frontend`)
3532
- the documentation sources (in `docs`)
3633

37-
## Getting Started
34+
## Get involved
35+
Submit a bug or feature request [here](https://github.com/alan-turing-institute/scivision/issues).
36+
37+
If you would like a link to a model or datasource to be listed in the catalog, such a contribution would be gratefully received. These can be submitted through the [scivision website](https://sci.vision/#/contribute). See the [Contributing Guide](https://scivision.readthedocs.io/en/latest/contributing.html) for more details on how to format your model / data.
38+
39+
Pull requests for code changes are also welcome.
40+
41+
42+
## Getting Started with Scivision.Py
3843

3944
A quick overview of using the Scivision.Py python package.
4045

@@ -91,7 +96,7 @@ plt.imshow(test_image)
9196

9297
![Image showing test_image (a picture of a Koala)](https://upload.wikimedia.org/wikipedia/commons/thumb/2/21/Cutest_Koala.jpg/262px-Cutest_Koala.jpg)
9398

94-
- [More about datasources](https://scivision.readthedocs.io/en/latest/datasource_repository_template.html)
99+
- [More about datasources](https://scivision.readthedocs.io/en/latest/data_repository_template.html)
95100

96101
### Run a Scivision model
97102

@@ -122,8 +127,7 @@ Output:
122127
|||||||||||||
123128

124129

125-
- [Contributing an entry to the catalog](https://scivision.readthedocs.io/en/latest/contributing.html#extending-the-scivision-catalog)
126-
- The catalogs are browsable online:
130+
The catalogs are browsable online:
127131
- [model catalog](https://sci.vision/#/model-grid)
128132
- [datasource catalog](https://sci.vision/#/datasource-grid)
129133

docs/maintainers.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ If you are new to the `scivision` project and wish to become a maintainer for ei
1515

1616
A new release of the scivision package will be uploaded to PyPI each time a tagged commit is pushed to the main branch of the [scivision GitHub repo](https://github.com/alan-turing-institute/scivision). In order to trigger this automated process, do the following:
1717

18-
1. On a new branch of the `scivision` repo, containing your changes to be included in the release, increment the `version` in `setup.py` and any other metadata that differs for the new release.
18+
1. On a new branch of the `scivision` repo, containing your changes to be included in the release, increment the `version` in `pyproject.toml` and any other metadata that differs for the new release.
1919

2020
2. Create a pull request and merge to the `main` branch.
2121

22-
3. At the main repo page on GitHub, click the following `Releases -> Draft a new release`. Click `Choose a tag` and create a new tag named as the `version` number. Fill in the descriptive fields and publish the release. After a few moments, the new version should show up at https://pypi.org/project/scivision/
22+
3. At the main repo page on GitHub, click the following `Releases -> Draft a new release`. Click `Choose a tag` and create a new tag named as the `version` number. Fill in the descriptive fields and publish the release. (You don't need to upload the binaries as these are automatically generated). After a few moments, the new version should show up at https://pypi.org/project/scivision/
2323

2424
Alternatively, developers of `scivision` with maintainer access to https://github.com/alan-turing-institute/scivision & https://pypi.org/project/scivision can manually release a new version of the package with the following steps:
2525

26-
1. On a new branch of the `scivision` repo, containing your changes to be included in the release, increment the `version` in `setup.py` and any other metadata that differs for the new release.
26+
1. On a new branch of the `scivision` repo, containing your changes to be included in the release, increment the `version` in `pyproject.toml` and any other metadata that differs for the new release.
2727

2828
2. Make sure you have a working python 3 installation. Check your version with:
2929

@@ -46,7 +46,7 @@ Alternatively, developers of `scivision` with maintainer access to https://githu
4646
python -m twine upload dist/<version>*
4747
```
4848
* Note: You'll need to provide your PyPI username and password
49-
6. Commit changes to `setup.py` and pull request to the `main` branch of https://github.com/alan-turing-institute/scivision
49+
6. Commit changes to `pyproject.toml` and pull request to the `main` branch of https://github.com/alan-turing-institute/scivision
5050

5151
.. _building:
5252

@@ -81,4 +81,4 @@ Maintainers of this `readthedocs` site can build and view the docs by doing the
8181
5. Push the updates to the readthedocs site:
8282
* Create a pull request with your changes
8383
* A build of the docs should be triggered
84-
* You can also log into the https://readthedocs.org/projects/scivision/ dashboard as a maintainer and click `Builds->Build Version`
84+
* You can also log into the https://readthedocs.org/projects/scivision/ dashboard as a maintainer and click `Builds->Build Version`

0 commit comments

Comments
 (0)