Skip to content

Commit

Permalink
Merge branch 'feature/v0.2.0' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
KelSolaar committed Feb 27, 2022
2 parents 001f130 + 070aa25 commit 8bbf136
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 5 deletions.
9 changes: 6 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ Colour - Datasets
|actions| |coveralls| |codacy| |version|

.. |actions| image:: https://img.shields.io/github/workflow/status/colour-science/colour-datasets/Continuous%20Integration?label=actions&logo=github&style=flat-square
.. |actions| image:: https://img.shields.io/github/workflow/status/colour-science/colour-datasets/Continuous%20Integration%20-%20Quality%20&%20Unit%20Tests?label=actions&logo=github&style=flat-square
:target: https://github.com/colour-science/colour-datasets/actions
:alt: Develop Build Status
.. |coveralls| image:: https://img.shields.io/coveralls/colour-science/colour-datasets/develop.svg?style=flat-square
:target: https://coveralls.io/r/colour-science/colour-datasets
:alt: Coverage Status
.. |codacy| image:: https://img.shields.io/codacy/grade/984900e3a85e40239a0f8f633dd1ebcb/develop.svg?style=flat-square
.. |codacy| image:: https://img.shields.io/codacy/grade/83345fbde65545d2a4499f32e72866ed/develop.svg?style=flat-square
:target: https://www.codacy.com/app/colour-science/colour-datasets
:alt: Code Grade
.. |version| image:: https://img.shields.io/pypi/v/colour-datasets.svg?style=flat-square
Expand Down Expand Up @@ -156,8 +156,11 @@ Primary Dependencies
**Colour - Datasets** requires various dependencies in order to run:

- `python >= 3.8, < 4 <https://www.python.org/download/releases/>`__
- `colour-science <https://pypi.org/project/colour-science/>`__
- `cachetools <https://pypi.org/project/cachetools/>`__
- `colour-science >= 4 <https://pypi.org/project/colour-science/>`__
- `imageio >= 2, < 3 <https://imageio.github.io/>`__
- `numpy >= 1.19, < 2 <https://pypi.org/project/numpy/>`__
- `scipy >= 1.5, < 2 <https://pypi.org/project/scipy/>`__
- `tqdm <https://pypi.org/project/tqdm/>`__
- `xlrd <https://pypi.org/project/xlrd/>`__

Expand Down
5 changes: 4 additions & 1 deletion docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ Primary Dependencies
**Colour - Datasets** requires various dependencies in order to run:

- `python >= 3.8, < 4 <https://www.python.org/download/releases/>`__
- `colour-science <https://pypi.org/project/colour-science/>`__
- `cachetools <https://pypi.org/project/cachetools/>`__
- `colour-science >= 4 <https://pypi.org/project/colour-science/>`__
- `imageio >= 2, < 3 <https://imageio.github.io/>`__
- `numpy >= 1.19, < 2 <https://pypi.org/project/numpy/>`__
- `scipy >= 1.5, < 2 <https://pypi.org/project/scipy/>`__
- `tqdm <https://pypi.org/project/tqdm/>`__
- `xlrd <https://pypi.org/project/xlrd/>`__

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ cfgv==3.3.1
charset-normalizer==2.0.12
click==8.0.4
colorama==0.4.4
colour-science==0.4.0
colour-science==0.4.1
coverage==6.3.2
coveralls==3.3.1
distlib==0.3.4
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"cachetools",
"colour-science>=0.4.0",
"imageio>=2,<3",
"numpy>=1.19,<2",
"opencv-python>=4,<5",
"scipy>=1.5,<2",
"tqdm",
Expand Down

0 comments on commit 8bbf136

Please sign in to comment.