Skip to content

Commit ba72da3

Browse files
KelSolaarKelSolaar
committed
Overhaul "Poetry" dependencies.
1 parent 0a40eac commit ba72da3

File tree

8 files changed

+308
-415
lines changed

8 files changed

+308
-415
lines changed

‎.github/workflows/continuous-integration-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
- name: Install Package Dependencies
4040
run: |
4141
poetry run python -m pip install --upgrade pip
42-
poetry install --extras "read-the-docs"
42+
poetry install
4343
poetry run python -c "import imageio;imageio.plugins.freeimage.download()"
4444
shell: bash
4545
- name: Build Documentation

‎.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
repos:
22
- repo: https://github.com/ikamensh/flynt/
3-
rev: '0.77'
3+
rev: '1.0.1'
44
hooks:
55
- id: flynt
66
- repo: https://github.com/charliermarsh/ruff-pre-commit
7-
rev: 'v0.0.239'
7+
rev: 'v0.0.285'
88
hooks:
99
- id: ruff
1010
- repo: https://github.com/psf/black
11-
rev: 22.10.0
11+
rev: 23.7.0
1212
hooks:
1313
- id: black
1414
language_version: python3.9

‎.readthedocs.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,5 @@ formats:
1313
- pdf
1414

1515
python:
16-
install:
17-
- method: pip
18-
path: .
19-
extra_requirements:
20-
- read-the-docs
16+
install:
17+
- requirements: docs/requirements.txt

‎docs/requirements.txt

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
accessible-pygments==0.0.4 ; python_version >= "3.9" and python_version < "3.12"
2+
alabaster==0.7.13 ; python_version >= "3.9" and python_version < "3.12"
3+
babel==2.12.1 ; python_version >= "3.9" and python_version < "3.12"
4+
beautifulsoup4==4.12.2 ; python_version >= "3.9" and python_version < "3.12"
5+
biblib-simple==0.1.2 ; python_version >= "3.9" and python_version < "3.12"
6+
certifi==2023.7.22 ; python_version >= "3.9" and python_version < "3.12"
7+
charset-normalizer==3.2.0 ; python_version >= "3.9" and python_version < "3.12"
8+
colorama==0.4.6 ; python_version >= "3.9" and python_version < "3.12" and sys_platform == "win32"
9+
colour-science==0.4.3 ; python_version >= "3.9" and python_version < "3.12"
10+
contourpy==1.1.0 ; python_version >= "3.9" and python_version < "3.12"
11+
cycler==0.11.0 ; python_version >= "3.9" and python_version < "3.12"
12+
docutils==0.17.1 ; python_version >= "3.9" and python_version < "3.12"
13+
fonttools==4.42.1 ; python_version >= "3.9" and python_version < "3.12"
14+
idna==3.4 ; python_version >= "3.9" and python_version < "3.12"
15+
imageio==2.31.2 ; python_version >= "3.9" and python_version < "3.12"
16+
imagesize==1.4.1 ; python_version >= "3.9" and python_version < "3.12"
17+
importlib-metadata==6.8.0 ; python_version >= "3.9" and python_version < "3.10"
18+
importlib-resources==6.0.1 ; python_version >= "3.9" and python_version < "3.10"
19+
jinja2==3.1.2 ; python_version >= "3.9" and python_version < "3.12"
20+
kiwisolver==1.4.5 ; python_version >= "3.9" and python_version < "3.12"
21+
latexcodec==2.0.1 ; python_version >= "3.9" and python_version < "3.12"
22+
markupsafe==2.1.3 ; python_version >= "3.9" and python_version < "3.12"
23+
matplotlib==3.7.2 ; python_version >= "3.9" and python_version < "3.12"
24+
numpy==1.25.2 ; python_version >= "3.9" and python_version < "3.12"
25+
opencv-python==4.8.0.76 ; python_version >= "3.9" and python_version < "3.12"
26+
packaging==23.1 ; python_version >= "3.9" and python_version < "3.12"
27+
pillow==10.0.0 ; python_version >= "3.9" and python_version < "3.12"
28+
pybtex-docutils==1.0.3 ; python_version >= "3.9" and python_version < "3.12"
29+
pybtex==0.24.0 ; python_version >= "3.9" and python_version < "3.12"
30+
pydata-sphinx-theme==0.13.3 ; python_version >= "3.9" and python_version < "3.12"
31+
pygments==2.16.1 ; python_version >= "3.9" and python_version < "3.12"
32+
pyparsing==3.0.9 ; python_version >= "3.9" and python_version < "3.12"
33+
python-dateutil==2.8.2 ; python_version >= "3.9" and python_version < "3.12"
34+
pyyaml==6.0.1 ; python_version >= "3.9" and python_version < "3.12"
35+
requests==2.31.0 ; python_version >= "3.9" and python_version < "3.12"
36+
restructuredtext-lint==1.4.0 ; python_version >= "3.9" and python_version < "3.12"
37+
scipy==1.11.2 ; python_version >= "3.9" and python_version < "3.12"
38+
six==1.16.0 ; python_version >= "3.9" and python_version < "3.12"
39+
snowballstemmer==2.2.0 ; python_version >= "3.9" and python_version < "3.12"
40+
soupsieve==2.4.1 ; python_version >= "3.9" and python_version < "3.12"
41+
sphinx==4.5.0 ; python_version >= "3.9" and python_version < "3.12"
42+
sphinxcontrib-applehelp==1.0.4 ; python_version >= "3.9" and python_version < "3.12"
43+
sphinxcontrib-bibtex==2.6.1 ; python_version >= "3.9" and python_version < "3.12"
44+
sphinxcontrib-devhelp==1.0.2 ; python_version >= "3.9" and python_version < "3.12"
45+
sphinxcontrib-htmlhelp==2.0.1 ; python_version >= "3.9" and python_version < "3.12"
46+
sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.9" and python_version < "3.12"
47+
sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.9" and python_version < "3.12"
48+
sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.9" and python_version < "3.12"
49+
typing-extensions==4.7.1 ; python_version >= "3.9" and python_version < "3.12"
50+
urllib3==2.0.4 ; python_version >= "3.9" and python_version < "3.12"
51+
zipp==3.16.2 ; python_version >= "3.9" and python_version < "3.10"

‎pyproject.toml

Lines changed: 56 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -47,36 +47,15 @@ exclude = [
4747
python = ">= 3.9, < 3.12"
4848
colour-science = ">= 0.4.2"
4949
imageio = ">= 2, < 3"
50-
numpy = ">= 1.21, < 2"
50+
numpy = ">= 1.22, < 2"
5151
opencv-python = ">= 4, < 5"
52-
scipy = ">= 1.7, < 2"
52+
scipy = ">= 1.8, < 2"
5353
typing-extensions = ">= 4, < 5"
5454

55-
matplotlib = { version = ">= 3.5, != 3.5.0, != 3.5.1", optional = true }
55+
[tool.poetry.group.optional.dependencies]
56+
matplotlib = ">= 3.5, != 3.5.0, != 3.5.1"
5657

57-
biblib-simple = { version = "*", optional = true } # Development dependency.
58-
black = { version = "*", optional = true } # Development dependency.
59-
blackdoc = { version = "*", optional = true } # Development dependency.
60-
coverage = { version = "*", optional = true } # Development dependency.
61-
coveralls = { version = "*", optional = true } # Development dependency.
62-
flynt = { version = "*", optional = true } # Development dependency.
63-
invoke = { version = "*", optional = true } # Development dependency.
64-
jupyter = { version = "*", optional = true } # Development dependency.
65-
pre-commit = { version = "*", optional = true } # Development dependency.
66-
pydata-sphinx-theme = { version = "*", optional = true } # Development dependency.
67-
pyright = { version = "*", optional = true } # Development dependency.
68-
pytest = { version = "*", optional = true } # Development dependency.
69-
pytest-cov = { version = "*", optional = true } # Development dependency.
70-
pytest-xdist = { version = "*", optional = true} # Development dependency
71-
restructuredtext-lint = { version = "*", optional = true } # Development dependency.
72-
ruff = { version = "*", optional = true } # Development dependency.
73-
sphinx = { version = ">= 4, < 5", optional = true } # Development dependency.
74-
sphinxcontrib-bibtex = { version = "*", optional = true } # Development dependency.
75-
toml = { version = "*", optional = true } # Development dependency.
76-
twine = { version = "*", optional = true } # Development dependency.
77-
78-
[tool.poetry.dev-dependencies]
79-
biblib-simple = "*"
58+
[tool.poetry.group.dev.dependencies]
8059
black = "*"
8160
blackdoc = "*"
8261
coverage = "!= 6.3"
@@ -85,43 +64,20 @@ flynt = "*"
8564
invoke = "*"
8665
jupyter = "*"
8766
pre-commit = "*"
88-
pydata-sphinx-theme = "*"
8967
pyright = "*"
9068
pytest = "*"
9169
pytest-cov = "*"
9270
pytest-xdist = "*"
93-
restructuredtext-lint = "*"
9471
ruff = "*"
95-
sphinx = ">= 4, < 5"
96-
sphinxcontrib-bibtex = "*"
9772
toml = "*"
9873
twine = "*"
9974

100-
[tool.poetry.extras]
101-
development = [
102-
"biblib-simple",
103-
"black",
104-
"blackdoc",
105-
"coverage",
106-
"coveralls",
107-
"flynt",
108-
"invoke",
109-
"jupyter",
110-
"pre-commit",
111-
"pydata-sphinx-theme",
112-
"pyright",
113-
"pytest",
114-
"pytest-cov",
115-
"pytest-xdist",
116-
"restructuredtext-lint",
117-
"ruff",
118-
"sphinx",
119-
"sphinxcontrib-bibtex",
120-
"toml",
121-
"twine",
122-
]
123-
plotting = [ "matplotlib" ]
124-
read-the-docs = [ "matplotlib", "pydata-sphinx-theme", "sphinxcontrib-bibtex" ]
75+
[tool.poetry.group.docs.dependencies]
76+
biblib-simple = "*"
77+
pydata-sphinx-theme = "*"
78+
restructuredtext-lint = "*"
79+
sphinx = ">= 4, < 5"
80+
sphinxcontrib-bibtex = "*"
12581

12682
[tool.black]
12783
line-length = 79
@@ -152,47 +108,47 @@ addopts = "-n auto --dist=loadscope --durations=5"
152108
target-version = "py39"
153109
line-length = 88
154110
select = [
155-
"A", # flake8-builtins
156-
"ARG", # flake8-unused-arguments
157-
# "ANN", # flake8-annotations
158-
"B", # flake8-bugbear
159-
# "BLE", # flake8-blind-except
160-
"C4", # flake8-comprehensions
161-
# "C90", # mccabe
162-
# "COM", # flake8-commas
163-
"DTZ", # flake8-datetimez
164-
"D", # pydocstyle
165-
"E", # pydocstyle
166-
# "ERA", # eradicate
167-
# "EM", # flake8-errmsg
168-
"EXE", # flake8-executable
169-
"F", # flake8
170-
# "FBT", # flake8-boolean-trap
171-
"G", # flake8-logging-format
172-
"I", # isort
173-
"ICN", # flake8-import-conventions
174-
"INP", # flake8-no-pep420
175-
"ISC", # flake8-implicit-str-concat
176-
"N", # pep8-naming
177-
# "PD", # pandas-vet
178-
"PIE", # flake8-pie
179-
"PGH", # pygrep-hooks
180-
"PL", # pylint
181-
# "PT", # flake8-pytest-style
182-
# "PTH", # flake8-use-pathlib [Enable]
183-
"Q", # flake8-quotes
184-
"RET", # flake8-return
185-
"RUF", # Ruff
186-
"S", # flake8-bandit
187-
"SIM", # flake8-simplify
188-
"T10", # flake8-debugger
189-
"T20", # flake8-print
190-
# "TCH", # flake8-type-checking
191-
"TID", # flake8-tidy-imports
192-
"TRY", # tryceratops
193-
"UP", # pyupgrade
194-
"W", # pydocstyle
195-
"YTT" # flake8-2020
111+
"A", # flake8-builtins
112+
"ARG", # flake8-unused-arguments
113+
# "ANN", # flake8-annotations
114+
"B", # flake8-bugbear
115+
# "BLE", # flake8-blind-except
116+
"C4", # flake8-comprehensions
117+
# "C90", # mccabe
118+
# "COM", # flake8-commas
119+
"DTZ", # flake8-datetimez
120+
"D", # pydocstyle
121+
"E", # pydocstyle
122+
# "ERA", # eradicate
123+
# "EM", # flake8-errmsg
124+
"EXE", # flake8-executable
125+
"F", # flake8
126+
# "FBT", # flake8-boolean-trap
127+
"G", # flake8-logging-format
128+
"I", # isort
129+
"ICN", # flake8-import-conventions
130+
"INP", # flake8-no-pep420
131+
"ISC", # flake8-implicit-str-concat
132+
"N", # pep8-naming
133+
# "PD", # pandas-vet
134+
"PIE", # flake8-pie
135+
"PGH", # pygrep-hooks
136+
"PL", # pylint
137+
# "PT", # flake8-pytest-style
138+
# "PTH", # flake8-use-pathlib [Enable]
139+
"Q", # flake8-quotes
140+
"RET", # flake8-return
141+
"RUF", # Ruff
142+
"S", # flake8-bandit
143+
"SIM", # flake8-simplify
144+
"T10", # flake8-debugger
145+
"T20", # flake8-print
146+
# "TCH", # flake8-type-checking
147+
"TID", # flake8-tidy-imports
148+
"TRY", # tryceratops
149+
"UP", # pyupgrade
150+
"W", # pydocstyle
151+
"YTT" # flake8-2020
196152
]
197153
ignore = [
198154
"B008",
@@ -211,9 +167,13 @@ ignore = [
211167
"N813",
212168
"N815",
213169
"N816",
170+
"PGH003",
214171
"PIE804",
215172
"PLE0605",
173+
"PLR0911",
174+
"PLR0912",
216175
"PLR0913",
176+
"PLR0915",
217177
"PLR2004",
218178
"RET504",
219179
"RET505",
@@ -232,7 +192,6 @@ convention = "numpy"
232192
[tool.ruff.per-file-ignores]
233193
"colour-checker-detection/examples/*" = ["INP", "T201", "T203"]
234194
"docs/*" = ["INP"]
235-
"setup.py" = ["INP"]
236195
"tasks.py" = ["INP"]
237196
"utilities/*" = ["EXE001", "INP"]
238197
"utilities/unicode_to_ascii.py" = ["RUF001"]

0 commit comments

Comments
 (0)