Skip to content

Commit 2792557

Browse files
committed
Use Poetry 1.2
This is needed because Poetry 1.2 is the version that introduced return codes for scripts generated by Poetry, and we depend on the return code of `reuse`. See <python-poetry/poetry#2369>. Signed-off-by: Carmen Bianca BAKKER <[email protected]>
1 parent 9cae394 commit 2792557

6 files changed

+141
-144
lines changed

.readthedocs.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ build:
1313
python:
1414
install:
1515
# This file is generated with poetry as follows:
16-
# poetry export --only=dev >docs/requirements-docs.txt
16+
# poetry export --with docs --without-hashes >docs/requirements-docs.txt
1717
- requirements: docs/requirements.txt
1818

1919
sphinx:

CONTRIBUTING.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,12 @@ Next, you'll find the following commands handy:
5959
### Poetry
6060

6161
Because our downstreams may not have a very recent version of Poetry, we should
62-
target `poetry-core~=1.0.0` and `poetry~=1.1.0` when interacting with Poetry,
62+
target `poetry-core>=1.1.0` and `poetry~=1.2.0` when interacting with Poetry,
6363
especially when generating the `poetry.lock` file. You can
64-
`pip install poetry~=1.1.0` to ascertain that you always get this right.
64+
`pip install poetry~=1.2.0` to ascertain that you always get this right.
65+
66+
In order to update the `poetry.lock` file while changing as few lines as
67+
possible, run `poetry lock --no-update`.
6568

6669
## Release checklist
6770

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ lint-third-party: ## Lint selected third-party repositories to compare with expe
5858

5959
.PHONY: docs
6060
docs: ## generate Sphinx HTML documentation, including API docs
61-
poetry export --dev --without-hashes >docs/requirements.txt
61+
poetry export --with docs --without-hashes >docs/requirements.txt
6262
$(MAKE) -C docs html
6363

6464
.PHONY: docs-ci

docs/requirements.txt

+39-69
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,39 @@
1-
alabaster==0.7.13; python_version >= "3.8"
2-
astroid==2.15.5; python_full_version >= "3.7.2"
3-
babel==2.12.1; python_version >= "3.8"
4-
beautifulsoup4==4.12.2; python_full_version >= "3.6.0" and python_version >= "3.7"
5-
binaryornot==0.4.4
6-
black==23.3.0; python_version >= "3.7"
7-
boolean.py==4.0
8-
bump2version==1.0.1; python_version >= "3.5"
9-
certifi==2023.5.7; python_version >= "3.8"
10-
cfgv==3.3.1; python_full_version >= "3.6.1" and python_version >= "3.7"
11-
chardet==5.1.0; python_version >= "3.7"
12-
charset-normalizer==3.1.0; python_full_version >= "3.7.0" and python_version >= "3.8"
13-
click==8.1.3; python_version >= "3.7"
14-
colorama==0.4.6; sys_platform == "win32" and python_version >= "3.8" and python_full_version >= "3.7.2" and (python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.7.0") and (python_version >= "3.8" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.8" and python_full_version >= "3.7.0") and (python_version >= "3.7" and python_full_version < "3.0.0" and platform_system == "Windows" or platform_system == "Windows" and python_version >= "3.7" and python_full_version >= "3.7.0")
15-
commonmark==0.9.1
16-
coverage==7.2.7; python_version >= "3.7"
17-
dill==0.3.6
18-
distlib==0.3.6; python_version >= "3.7"
19-
docutils==0.20.1; python_version >= "3.8"
20-
exceptiongroup==1.1.1; python_version < "3.11" and python_version >= "3.7"
21-
filelock==3.12.1; python_version >= "3.7"
22-
furo==2023.5.20; python_version >= "3.7"
23-
identify==2.5.24; python_version >= "3.7"
24-
idna==3.4; python_version >= "3.8"
25-
imagesize==1.4.1; python_version >= "3.8" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.8"
26-
importlib-metadata==6.6.0; python_version < "3.10" and python_version >= "3.8"
27-
iniconfig==2.0.0; python_version >= "3.7"
28-
isort==5.12.0; python_full_version >= "3.8.0"
29-
jinja2==3.1.2; python_version >= "3.7"
30-
lazy-object-proxy==1.9.0; python_version >= "3.7" and python_full_version >= "3.7.2"
31-
license-expression==30.1.1; python_version >= "3.7"
32-
markupsafe==2.1.3; python_version >= "3.8"
33-
mccabe==0.7.0; python_version >= "3.6" and python_full_version >= "3.7.2"
34-
mypy-extensions==1.0.0; python_version >= "3.7"
35-
nodeenv==1.8.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.7.0" and python_version >= "3.7"
36-
packaging==23.1; python_version >= "3.8"
37-
pathspec==0.11.1; python_version >= "3.7"
38-
pbr==5.11.1; python_version >= "2.6"
39-
platformdirs==3.5.3; python_version >= "3.7" and python_full_version >= "3.7.2"
40-
pluggy==1.0.0; python_version >= "3.7"
41-
pre-commit==2.21.0; python_version >= "3.7"
42-
pygments==2.15.1; python_version >= "3.8"
43-
pylint==2.17.4; python_full_version >= "3.7.2"
44-
pytest-cov==4.1.0; python_version >= "3.7"
45-
pytest==7.3.1; python_version >= "3.7"
46-
python-debian==0.1.49; python_version >= "3.5"
47-
pytz==2023.3; python_version < "3.9" and python_version >= "3.8"
48-
pyyaml==6.0; python_version >= "3.7"
49-
recommonmark==0.7.1
50-
requests==2.31.0; python_version >= "3.8"
51-
snowballstemmer==2.2.0; python_version >= "3.8"
52-
soupsieve==2.4.1; python_full_version >= "3.6.0" and python_version >= "3.7"
53-
sphinx-autodoc-typehints==1.23.4; python_version >= "3.7"
54-
sphinx-basic-ng==1.0.0b1; python_version >= "3.7"
55-
sphinx==7.0.1; python_version >= "3.8"
56-
sphinxcontrib-apidoc==0.3.0
57-
sphinxcontrib-applehelp==1.0.4; python_version >= "3.8"
58-
sphinxcontrib-devhelp==1.0.2; python_version >= "3.8"
59-
sphinxcontrib-htmlhelp==2.0.1; python_version >= "3.8"
60-
sphinxcontrib-jsmath==1.0.1; python_version >= "3.8"
61-
sphinxcontrib-qthelp==1.0.3; python_version >= "3.8"
62-
sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.8"
63-
tomli==2.0.1; python_version < "3.11" and python_version >= "3.7" and python_full_version >= "3.7.2" and python_full_version <= "3.11.0a6"
64-
tomlkit==0.11.8; python_version >= "3.7" and python_full_version >= "3.7.2"
65-
typing-extensions==4.6.3; python_version < "3.10" and python_version >= "3.7" and python_full_version >= "3.7.2"
66-
urllib3==2.0.3; python_version >= "3.8"
67-
virtualenv==20.23.0; python_version >= "3.7"
68-
wrapt==1.15.0
69-
zipp==3.15.0; python_version < "3.10" and python_version >= "3.8"
1+
alabaster==0.7.13 ; python_version >= "3.8" and python_version < "4.0"
2+
babel==2.12.1 ; python_version >= "3.8" and python_version < "4.0"
3+
beautifulsoup4==4.12.2 ; python_version >= "3.8" and python_version < "4.0"
4+
binaryornot==0.4.4 ; python_version >= "3.8" and python_version < "4.0"
5+
boolean-py==4.0 ; python_version >= "3.8" and python_version < "4.0"
6+
certifi==2023.5.7 ; python_version >= "3.8" and python_version < "4.0"
7+
chardet==5.1.0 ; python_version >= "3.8" and python_version < "4.0"
8+
charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "4.0"
9+
colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32"
10+
commonmark==0.9.1 ; python_version >= "3.8" and python_version < "4.0"
11+
docutils==0.20.1 ; python_version >= "3.8" and python_version < "4.0"
12+
furo==2023.5.20 ; python_version >= "3.8" and python_version < "4.0"
13+
idna==3.4 ; python_version >= "3.8" and python_version < "4.0"
14+
imagesize==1.4.1 ; python_version >= "3.8" and python_version < "4.0"
15+
importlib-metadata==6.7.0 ; python_version >= "3.8" and python_version < "3.10"
16+
jinja2==3.1.2 ; python_version >= "3.8" and python_version < "4.0"
17+
license-expression==30.1.1 ; python_version >= "3.8" and python_version < "4.0"
18+
markupsafe==2.1.3 ; python_version >= "3.8" and python_version < "4.0"
19+
packaging==23.1 ; python_version >= "3.8" and python_version < "4.0"
20+
pbr==5.11.1 ; python_version >= "3.8" and python_version < "4.0"
21+
pygments==2.15.1 ; python_version >= "3.8" and python_version < "4.0"
22+
python-debian==0.1.49 ; python_version >= "3.8" and python_version < "4.0"
23+
pytz==2023.3 ; python_version >= "3.8" and python_version < "3.9"
24+
recommonmark==0.7.1 ; python_version >= "3.8" and python_version < "4.0"
25+
requests==2.31.0 ; python_version >= "3.8" and python_version < "4.0"
26+
snowballstemmer==2.2.0 ; python_version >= "3.8" and python_version < "4.0"
27+
soupsieve==2.4.1 ; python_version >= "3.8" and python_version < "4.0"
28+
sphinx-autodoc-typehints==1.23.2 ; python_version >= "3.8" and python_version < "4.0"
29+
sphinx-basic-ng==1.0.0b1 ; python_version >= "3.8" and python_version < "4.0"
30+
sphinx==7.0.1 ; python_version >= "3.8" and python_version < "4.0"
31+
sphinxcontrib-apidoc==0.3.0 ; python_version >= "3.8" and python_version < "4.0"
32+
sphinxcontrib-applehelp==1.0.4 ; python_version >= "3.8" and python_version < "4.0"
33+
sphinxcontrib-devhelp==1.0.2 ; python_version >= "3.8" and python_version < "4.0"
34+
sphinxcontrib-htmlhelp==2.0.1 ; python_version >= "3.8" and python_version < "4.0"
35+
sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.8" and python_version < "4.0"
36+
sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.8" and python_version < "4.0"
37+
sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.8" and python_version < "4.0"
38+
urllib3==2.0.3 ; python_version >= "3.8" and python_version < "4.0"
39+
zipp==3.15.0 ; python_version >= "3.8" and python_version < "3.10"

0 commit comments

Comments
 (0)