Skip to content

Commit

Permalink
Merge branch 'feature/v0.4.4' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@KelSolaar
KelSolaar committed Sep 18, 2023
2 parents a8b8a29 + 5683416 commit bc5ddcd
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 73 deletions.
8 changes: 7 additions & 1 deletion README.rst
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
.. image:: https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_001.png
.. raw:: html

<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_Dark_001.svg">
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_001.svg">
<img style="background:rgb(0, 0, 0, 0) !important;" src="https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_001.svg">
</picture>

|
Expand Down
8 changes: 7 additions & 1 deletion docs/index.rst
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
.. image:: https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_001.png
.. raw:: html

<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_Dark_001.svg">
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_001.svg">
<img style="background:rgb(0, 0, 0, 0) !important;" src="https://raw.githubusercontent.com/colour-science/colour-branding/master/images/Colour_Logo_001.svg">
</picture>

|
Expand Down
41 changes: 22 additions & 19 deletions docs/requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,55 @@ biblib-simple==0.1.2 ; python_version >= "3.9" and python_version < "3.12"
certifi==2023.7.22 ; python_version >= "3.9" and python_version < "3.12"
charset-normalizer==3.2.0 ; python_version >= "3.9" and python_version < "3.12"
colorama==0.4.6 ; python_version >= "3.9" and python_version < "3.12" and (platform_system == "Windows" or sys_platform == "win32")
contourpy==1.1.0 ; python_version >= "3.9" and python_version < "3.12"
contourpy==1.1.1 ; python_version >= "3.9" and python_version < "3.12"
cycler==0.11.0 ; python_version >= "3.9" and python_version < "3.12"
docutils==0.17.1 ; python_version >= "3.9" and python_version < "3.12"
docutils==0.20.1 ; python_version >= "3.9" and python_version < "3.12"
fonttools==4.42.1 ; python_version >= "3.9" and python_version < "3.12"
idna==3.4 ; python_version >= "3.9" and python_version < "3.12"
imageio==2.31.1 ; python_version >= "3.9" and python_version < "3.12"
imageio==2.31.3 ; python_version >= "3.9" and python_version < "3.12"
imagesize==1.4.1 ; python_version >= "3.9" and python_version < "3.12"
importlib-metadata==6.8.0 ; python_version >= "3.9" and python_version < "3.10"
importlib-resources==6.0.1 ; python_version >= "3.9" and python_version < "3.10"
jinja2==3.1.2 ; python_version >= "3.9" and python_version < "3.12"
kiwisolver==1.4.5 ; python_version >= "3.9" and python_version < "3.12"
latexcodec==2.0.1 ; python_version >= "3.9" and python_version < "3.12"
markupsafe==2.1.3 ; python_version >= "3.9" and python_version < "3.12"
matplotlib==3.7.2 ; python_version >= "3.9" and python_version < "3.12"
matplotlib==3.8.0 ; python_version >= "3.9" and python_version < "3.12"
networkx==2.8.8 ; python_version >= "3.9" and python_version < "3.12"
numpy==1.25.2 ; python_version >= "3.9" and python_version < "3.12"
opencolorio==2.2.1 ; python_version >= "3.9" and python_version < "3.12"
numpy==1.26.0 ; python_version >= "3.9" and python_version < "3.12"
opencolorio==2.3.0 ; python_version >= "3.9" and python_version < "3.12"
packaging==23.1 ; python_version >= "3.9" and python_version < "3.12"
pandas==1.5.3 ; python_version >= "3.9" and python_version < "3.12"
pillow==10.0.0 ; python_version >= "3.9" and python_version < "3.12"
pillow==10.0.1 ; python_version >= "3.9" and python_version < "3.12"
pybtex-docutils==1.0.3 ; python_version >= "3.9" and python_version < "3.12"
pybtex==0.24.0 ; python_version >= "3.9" and python_version < "3.12"
pydata-sphinx-theme==0.13.3 ; python_version >= "3.9" and python_version < "3.12"
pydata-sphinx-theme==0.14.0 ; python_version >= "3.9" and python_version < "3.12"
pygments==2.16.1 ; python_version >= "3.9" and python_version < "3.12"
pygraphviz==1.11 ; python_version >= "3.9" and python_version < "3.12"
pyparsing==3.0.9 ; python_version >= "3.9" and python_version < "3.12"
pyparsing==3.1.1 ; python_version >= "3.9" and python_version < "3.12"
python-dateutil==2.8.2 ; python_version >= "3.9" and python_version < "3.12"
pytz==2023.3 ; python_version >= "3.9" and python_version < "3.12"
pytz==2023.3.post1 ; python_version >= "3.9" and python_version < "3.12"
pyyaml==6.0.1 ; python_version >= "3.9" and python_version < "3.12"
requests==2.31.0 ; python_version >= "3.9" and python_version < "3.12"
restructuredtext-lint==1.4.0 ; python_version >= "3.9" and python_version < "3.12"
scipy==1.11.2 ; python_version >= "3.9" and python_version < "3.12"
setuptools-scm==7.1.0 ; python_version >= "3.9" and python_version < "3.12"
setuptools==68.2.2 ; python_version >= "3.9" and python_version < "3.12"
six==1.16.0 ; python_version >= "3.9" and python_version < "3.12"
snowballstemmer==2.2.0 ; python_version >= "3.9" and python_version < "3.12"
soupsieve==2.4.1 ; python_version >= "3.9" and python_version < "3.12"
sphinx==4.5.0 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-applehelp==1.0.4 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-bibtex==2.6.0 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-devhelp==1.0.2 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-htmlhelp==2.0.1 ; python_version >= "3.9" and python_version < "3.12"
soupsieve==2.5 ; python_version >= "3.9" and python_version < "3.12"
sphinx==7.2.6 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-applehelp==1.0.7 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-bibtex==2.6.1 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-devhelp==1.0.5 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-htmlhelp==2.0.4 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-qthelp==1.0.6 ; python_version >= "3.9" and python_version < "3.12"
sphinxcontrib-serializinghtml==1.1.9 ; python_version >= "3.9" and python_version < "3.12"
tomli==2.0.1 ; python_version >= "3.9" and python_version < "3.11"
tqdm==4.66.1 ; python_version >= "3.9" and python_version < "3.12"
trimesh==3.23.5 ; python_version >= "3.9" and python_version < "3.12"
typing-extensions==4.7.1 ; python_version >= "3.9" and python_version < "3.12"
typing-extensions==4.8.0 ; python_version >= "3.9" and python_version < "3.12"
urllib3==2.0.4 ; python_version >= "3.9" and python_version < "3.12"
xxhash==3.3.0 ; python_version >= "3.9" and python_version < "3.12"
zipp==3.16.2 ; python_version >= "3.9" and python_version < "3.10"
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ twine = "*"
biblib-simple = "*"
pydata-sphinx-theme = "*"
restructuredtext-lint = "*"
sphinx = ">= 4, < 5"
sphinx = "*"
sphinxcontrib-bibtex = "*"

[tool.black]
Expand Down
Loading

0 comments on commit bc5ddcd

Please sign in to comment.