mirror of
https://github.com/certbot/certbot.git
synced 2026-07-26 07:39:52 +02:00
Summary of changes in this PR:
- Refactor files involved in the `certbot` module to be of a similar structure to every other package; that is, inside a directory inside the main repo root (see below).
- Make repo root README symlink to `certbot` README.
- Pull tests outside of the distributed module.
- Make `certbot/tests` not be a module so that `certbot` isn't added to Python's path for module discovery.
- Remove `--pyargs` from test calls, and make sure to call tests from repo root since without `--pyargs`, `pytest` takes directory names rather than package names as arguments.
- Replace mentions of `.` with `certbot` when referring to packages to install, usually editably.
- Clean up some unused code around executing tests in a different directory.
- Create public shim around main and make that the entry point.
New directory structure summary:
```
repo root ("certbot", probably, but for clarity all files I mention are relative to here)
├── certbot
│ ├── setup.py
│ ├── certbot
│ │ ├── __init__.py
│ │ ├── achallenges.py
│ │ ├── _internal
│ │ │ ├── __init__.py
│ │ │ ├── account.py
│ │ │ ├── ...
│ │ ├── ...
│ ├── tests
│ │ ├── account_test.py
│ │ ├── display
│ │ │ ├── __init__.py
│ │ │ ├── ...
│ │ ├── ... # note no __init__.py at this level
│ ├── ...
├── acme
│ ├── ...
├── certbot-apache
│ ├── ...
├── ...
```
* refactor certbot/ and certbot/tests/ to use the same structure as the other packages
* git grep -lE "\-e(\s+)\." | xargs sed -i -E "s/\-e(\s+)\./-e certbot/g"
* git grep -lE "\.\[dev\]" | xargs sed -i -E "s/\.\[dev\]/certbot[dev]/g"
* git grep -lE "\.\[dev3\]" | xargs sed -i -E "s/\.\[dev3\]/certbot[dev3]/g"
* Remove replacement of certbot into . in install_and_test.py
* copy license back out to main folder
* remove linter_plugin.py and CONTRIBUTING.md from certbot/MANIFEST.in because these files are not under certbot/
* Move README back into main folder, and make the version inside certbot/ a symlink
* symlink certbot READMEs the other way around
* move testdata into the public api certbot zone
* update source_paths in tox.ini to certbot/certbot to find the right subfolder for tests
* certbot version has been bumped down a directory level
* make certbot tests directory not a package and import sibling as module
* Remove unused script cruft
* change . to certbot in test_sdists
* remove outdated comment referencing a command that doesn't work
* Install instructions should reference an existing file
* update file paths in Dockerfile
* some package named in tox.ini were manually specified, change those to certbot
* new directory format doesn't work easily with pyargs according to http://doc.pytest.org/en/latest/goodpractices.html#tests-as-part-of-application-code
* remove other instance of pyargs
* fix up some references in _release.sh by searching for ' . ' and manual check
* another stray . in tox.ini
* fix paths in tools/_release.sh
* Remove final --pyargs call, and now-unnecessary call to modules instead of local files, since that's fixed by certbot's code being one layer deeper
* Create public shim around main and make that the entry point
* without pyargs, tests cannot be run from an empty directory
* Remove cruft for running certbot directly from main
* Have main shim take real arg
* add docs/api file for main, and fix up main comment
* Update certbot/docs/install.rst
Co-Authored-By: Brad Warren <bmw@users.noreply.github.com>
* Fix comments in readthedocs requirements files to refer to current package
* Update .[docs] reference in contributing.rst
* Move plugins tests to certbot tests directory
* add certbot tests to MANIFEST.in so packagers can run python setup.py test
* move examples directory inside certbot/
* Move CHANGELOG into certbot, and create a top-level symlink
* Remove unused sys and logging from main shim
* nginx http01 test no longer relies on certbot plugins common test
264 lines
6.8 KiB
Batchfile
264 lines
6.8 KiB
Batchfile
@ECHO OFF
|
|
|
|
REM Command file for Sphinx documentation
|
|
|
|
if "%SPHINXBUILD%" == "" (
|
|
set SPHINXBUILD=sphinx-build
|
|
)
|
|
set BUILDDIR=_build
|
|
set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
|
|
set I18NSPHINXOPTS=%SPHINXOPTS% .
|
|
if NOT "%PAPER%" == "" (
|
|
set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
|
|
set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
|
|
)
|
|
|
|
if "%1" == "" goto help
|
|
|
|
if "%1" == "help" (
|
|
:help
|
|
echo.Please use `make ^<target^>` where ^<target^> is one of
|
|
echo. html to make standalone HTML files
|
|
echo. dirhtml to make HTML files named index.html in directories
|
|
echo. singlehtml to make a single large HTML file
|
|
echo. pickle to make pickle files
|
|
echo. json to make JSON files
|
|
echo. htmlhelp to make HTML files and a HTML help project
|
|
echo. qthelp to make HTML files and a qthelp project
|
|
echo. devhelp to make HTML files and a Devhelp project
|
|
echo. epub to make an epub
|
|
echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter
|
|
echo. text to make text files
|
|
echo. man to make manual pages
|
|
echo. texinfo to make Texinfo files
|
|
echo. gettext to make PO message catalogs
|
|
echo. changes to make an overview over all changed/added/deprecated items
|
|
echo. xml to make Docutils-native XML files
|
|
echo. pseudoxml to make pseudoxml-XML files for display purposes
|
|
echo. linkcheck to check all external links for integrity
|
|
echo. doctest to run all doctests embedded in the documentation if enabled
|
|
echo. coverage to run coverage check of the documentation if enabled
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "clean" (
|
|
for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
|
|
del /q /s %BUILDDIR%\*
|
|
goto end
|
|
)
|
|
|
|
|
|
REM Check if sphinx-build is available and fallback to Python version if any
|
|
%SPHINXBUILD% 2> nul
|
|
if errorlevel 9009 goto sphinx_python
|
|
goto sphinx_ok
|
|
|
|
:sphinx_python
|
|
|
|
set SPHINXBUILD=python -m sphinx.__init__
|
|
%SPHINXBUILD% 2> nul
|
|
if errorlevel 9009 (
|
|
echo.
|
|
echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
|
|
echo.installed, then set the SPHINXBUILD environment variable to point
|
|
echo.to the full path of the 'sphinx-build' executable. Alternatively you
|
|
echo.may add the Sphinx directory to PATH.
|
|
echo.
|
|
echo.If you don't have Sphinx installed, grab it from
|
|
echo.http://sphinx-doc.org/
|
|
exit /b 1
|
|
)
|
|
|
|
:sphinx_ok
|
|
|
|
|
|
if "%1" == "html" (
|
|
%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The HTML pages are in %BUILDDIR%/html.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "dirhtml" (
|
|
%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "singlehtml" (
|
|
%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "pickle" (
|
|
%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished; now you can process the pickle files.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "json" (
|
|
%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished; now you can process the JSON files.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "htmlhelp" (
|
|
%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished; now you can run HTML Help Workshop with the ^
|
|
.hhp project file in %BUILDDIR%/htmlhelp.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "qthelp" (
|
|
%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished; now you can run "qcollectiongenerator" with the ^
|
|
.qhcp project file in %BUILDDIR%/qthelp, like this:
|
|
echo.^> qcollectiongenerator %BUILDDIR%\qthelp\LetsEncrypt.qhcp
|
|
echo.To view the help file:
|
|
echo.^> assistant -collectionFile %BUILDDIR%\qthelp\LetsEncrypt.ghc
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "devhelp" (
|
|
%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "epub" (
|
|
%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The epub file is in %BUILDDIR%/epub.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "latex" (
|
|
%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "latexpdf" (
|
|
%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
|
|
cd %BUILDDIR%/latex
|
|
make all-pdf
|
|
cd %~dp0
|
|
echo.
|
|
echo.Build finished; the PDF files are in %BUILDDIR%/latex.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "latexpdfja" (
|
|
%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
|
|
cd %BUILDDIR%/latex
|
|
make all-pdf-ja
|
|
cd %~dp0
|
|
echo.
|
|
echo.Build finished; the PDF files are in %BUILDDIR%/latex.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "text" (
|
|
%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The text files are in %BUILDDIR%/text.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "man" (
|
|
%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The manual pages are in %BUILDDIR%/man.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "texinfo" (
|
|
%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "gettext" (
|
|
%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "changes" (
|
|
%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.The overview file is in %BUILDDIR%/changes.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "linkcheck" (
|
|
%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Link check complete; look for any errors in the above output ^
|
|
or in %BUILDDIR%/linkcheck/output.txt.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "doctest" (
|
|
%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Testing of doctests in the sources finished, look at the ^
|
|
results in %BUILDDIR%/doctest/output.txt.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "coverage" (
|
|
%SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Testing of coverage in the sources finished, look at the ^
|
|
results in %BUILDDIR%/coverage/python.txt.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "xml" (
|
|
%SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The XML files are in %BUILDDIR%/xml.
|
|
goto end
|
|
)
|
|
|
|
if "%1" == "pseudoxml" (
|
|
%SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml
|
|
if errorlevel 1 exit /b 1
|
|
echo.
|
|
echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml.
|
|
goto end
|
|
)
|
|
|
|
:end
|