Skip to content

Commit

Permalink
Use Poetry 1.2
Browse files Browse the repository at this point in the history
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 <carmenbianca@fsfe.org>
  • Loading branch information
carmenbianca committed Jun 25, 2023
1 parent 9d7da72 commit 25fbc63
Show file tree
Hide file tree
Showing 6 changed files with 141 additions and 144 deletions.
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ build:
python:
install:
# This file is generated with poetry as follows:
# poetry export --only=dev >docs/requirements-docs.txt
# poetry export --with docs --without-hashes >docs/requirements-docs.txt
- requirements: docs/requirements.txt

sphinx:
Expand Down
7 changes: 5 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,12 @@ Next, you'll find the following commands handy:
### Poetry

Because our downstreams may not have a very recent version of Poetry, we should
target `poetry-core~=1.0.0` and `poetry~=1.1.0` when interacting with Poetry,
target `poetry-core>=1.1.0` and `poetry~=1.2.0` when interacting with Poetry,
especially when generating the `poetry.lock` file. You can
`pip install poetry~=1.1.0` to ascertain that you always get this right.
`pip install poetry~=1.2.0` to ascertain that you always get this right.

In order to update the `poetry.lock` file while changing as few lines as
possible, run `poetry lock --no-update`.

## Release checklist

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ lint-third-party: ## Lint selected third-party repositories to compare with expe

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

.PHONY: docs-ci
Expand Down
108 changes: 39 additions & 69 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,69 +1,39 @@
alabaster==0.7.13; python_version >= "3.8"
astroid==2.15.5; python_full_version >= "3.7.2"
babel==2.12.1; python_version >= "3.8"
beautifulsoup4==4.12.2; python_full_version >= "3.6.0" and python_version >= "3.7"
binaryornot==0.4.4
black==23.3.0; python_version >= "3.7"
boolean.py==4.0
bump2version==1.0.1; python_version >= "3.5"
certifi==2023.5.7; python_version >= "3.8"
cfgv==3.3.1; python_full_version >= "3.6.1" and python_version >= "3.7"
chardet==5.1.0; python_version >= "3.7"
charset-normalizer==3.1.0; python_full_version >= "3.7.0" and python_version >= "3.8"
click==8.1.3; python_version >= "3.7"
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")
commonmark==0.9.1
coverage==7.2.7; python_version >= "3.7"
dill==0.3.6
distlib==0.3.6; python_version >= "3.7"
docutils==0.20.1; python_version >= "3.8"
exceptiongroup==1.1.1; python_version < "3.11" and python_version >= "3.7"
filelock==3.12.1; python_version >= "3.7"
furo==2023.5.20; python_version >= "3.7"
identify==2.5.24; python_version >= "3.7"
idna==3.4; python_version >= "3.8"
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"
importlib-metadata==6.6.0; python_version < "3.10" and python_version >= "3.8"
iniconfig==2.0.0; python_version >= "3.7"
isort==5.12.0; python_full_version >= "3.8.0"
jinja2==3.1.2; python_version >= "3.7"
lazy-object-proxy==1.9.0; python_version >= "3.7" and python_full_version >= "3.7.2"
license-expression==30.1.1; python_version >= "3.7"
markupsafe==2.1.3; python_version >= "3.8"
mccabe==0.7.0; python_version >= "3.6" and python_full_version >= "3.7.2"
mypy-extensions==1.0.0; python_version >= "3.7"
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"
packaging==23.1; python_version >= "3.8"
pathspec==0.11.1; python_version >= "3.7"
pbr==5.11.1; python_version >= "2.6"
platformdirs==3.5.3; python_version >= "3.7" and python_full_version >= "3.7.2"
pluggy==1.0.0; python_version >= "3.7"
pre-commit==2.21.0; python_version >= "3.7"
pygments==2.15.1; python_version >= "3.8"
pylint==2.17.4; python_full_version >= "3.7.2"
pytest-cov==4.1.0; python_version >= "3.7"
pytest==7.3.1; python_version >= "3.7"
python-debian==0.1.49; python_version >= "3.5"
pytz==2023.3; python_version < "3.9" and python_version >= "3.8"
pyyaml==6.0; python_version >= "3.7"
recommonmark==0.7.1
requests==2.31.0; python_version >= "3.8"
snowballstemmer==2.2.0; python_version >= "3.8"
soupsieve==2.4.1; python_full_version >= "3.6.0" and python_version >= "3.7"
sphinx-autodoc-typehints==1.23.4; python_version >= "3.7"
sphinx-basic-ng==1.0.0b1; python_version >= "3.7"
sphinx==7.0.1; python_version >= "3.8"
sphinxcontrib-apidoc==0.3.0
sphinxcontrib-applehelp==1.0.4; python_version >= "3.8"
sphinxcontrib-devhelp==1.0.2; python_version >= "3.8"
sphinxcontrib-htmlhelp==2.0.1; python_version >= "3.8"
sphinxcontrib-jsmath==1.0.1; python_version >= "3.8"
sphinxcontrib-qthelp==1.0.3; python_version >= "3.8"
sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.8"
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"
tomlkit==0.11.8; python_version >= "3.7" and python_full_version >= "3.7.2"
typing-extensions==4.6.3; python_version < "3.10" and python_version >= "3.7" and python_full_version >= "3.7.2"
urllib3==2.0.3; python_version >= "3.8"
virtualenv==20.23.0; python_version >= "3.7"
wrapt==1.15.0
zipp==3.15.0; python_version < "3.10" and python_version >= "3.8"
alabaster==0.7.13 ; python_version >= "3.8" and python_version < "4.0"
babel==2.12.1 ; python_version >= "3.8" and python_version < "4.0"
beautifulsoup4==4.12.2 ; python_version >= "3.8" and python_version < "4.0"
binaryornot==0.4.4 ; python_version >= "3.8" and python_version < "4.0"
boolean-py==4.0 ; python_version >= "3.8" and python_version < "4.0"
certifi==2023.5.7 ; python_version >= "3.8" and python_version < "4.0"
chardet==5.1.0 ; python_version >= "3.8" and python_version < "4.0"
charset-normalizer==3.1.0 ; python_version >= "3.8" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.8" and python_version < "4.0" and sys_platform == "win32"
commonmark==0.9.1 ; python_version >= "3.8" and python_version < "4.0"
docutils==0.20.1 ; python_version >= "3.8" and python_version < "4.0"
furo==2023.5.20 ; python_version >= "3.8" and python_version < "4.0"
idna==3.4 ; python_version >= "3.8" and python_version < "4.0"
imagesize==1.4.1 ; python_version >= "3.8" and python_version < "4.0"
importlib-metadata==6.7.0 ; python_version >= "3.8" and python_version < "3.10"
jinja2==3.1.2 ; python_version >= "3.8" and python_version < "4.0"
license-expression==30.1.1 ; python_version >= "3.8" and python_version < "4.0"
markupsafe==2.1.3 ; python_version >= "3.8" and python_version < "4.0"
packaging==23.1 ; python_version >= "3.8" and python_version < "4.0"
pbr==5.11.1 ; python_version >= "3.8" and python_version < "4.0"
pygments==2.15.1 ; python_version >= "3.8" and python_version < "4.0"
python-debian==0.1.49 ; python_version >= "3.8" and python_version < "4.0"
pytz==2023.3 ; python_version >= "3.8" and python_version < "3.9"
recommonmark==0.7.1 ; python_version >= "3.8" and python_version < "4.0"
requests==2.31.0 ; python_version >= "3.8" and python_version < "4.0"
snowballstemmer==2.2.0 ; python_version >= "3.8" and python_version < "4.0"
soupsieve==2.4.1 ; python_version >= "3.8" and python_version < "4.0"
sphinx-autodoc-typehints==1.23.2 ; python_version >= "3.8" and python_version < "4.0"
sphinx-basic-ng==1.0.0b1 ; python_version >= "3.8" and python_version < "4.0"
sphinx==7.0.1 ; python_version >= "3.8" and python_version < "4.0"
sphinxcontrib-apidoc==0.3.0 ; python_version >= "3.8" and python_version < "4.0"
sphinxcontrib-applehelp==1.0.4 ; python_version >= "3.8" and python_version < "4.0"
sphinxcontrib-devhelp==1.0.2 ; python_version >= "3.8" and python_version < "4.0"
sphinxcontrib-htmlhelp==2.0.1 ; python_version >= "3.8" and python_version < "4.0"
sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.8" and python_version < "4.0"
sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.8" and python_version < "4.0"
sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.8" and python_version < "4.0"
urllib3==2.0.3 ; python_version >= "3.8" and python_version < "4.0"
zipp==3.15.0 ; python_version >= "3.8" and python_version < "3.10"
Loading

0 comments on commit 25fbc63

Please sign in to comment.