Merge pull request #954 from tahoe-lafs/3536.sphinx-warnings

Fix some Sphinx warnings

Fixes: ticket:3536
This commit is contained in:
Sajith Sasidharan 2021-01-25 19:06:50 -05:00 committed by GitHub
commit c22cf5065a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 33 additions and 8 deletions

View File

@ -28,7 +28,7 @@ import os
# Add any Sphinx extension module names here, as strings. They can be # Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones. # ones.
extensions = [] extensions = ['recommonmark']
# Add any paths that contain templates here, relative to this directory. # Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates'] templates_path = ['_templates']
@ -36,7 +36,7 @@ templates_path = ['_templates']
# The suffix(es) of source filenames. # The suffix(es) of source filenames.
# You can specify multiple suffix as a list of string: # You can specify multiple suffix as a list of string:
# source_suffix = ['.rst', '.md'] # source_suffix = ['.rst', '.md']
source_suffix = '.rst' source_suffix = ['.rst', '.md']
# The encoding of source files. # The encoding of source files.
#source_encoding = 'utf-8-sig' #source_encoding = 'utf-8-sig'

1
docs/contributing.rst Normal file
View File

@ -0,0 +1 @@
.. include:: ../.github/CONTRIBUTING.rst

View File

@ -2032,10 +2032,11 @@ potential for surprises when the file store structure is changed.
Tahoe-LAFS provides a mutable file store, but the ways that the store can Tahoe-LAFS provides a mutable file store, but the ways that the store can
change are limited. The only things that can change are: change are limited. The only things that can change are:
* the mapping from child names to child objects inside mutable directories
(by adding a new child, removing an existing child, or changing an * the mapping from child names to child objects inside mutable directories
existing child to point to a different object) (by adding a new child, removing an existing child, or changing an
* the contents of mutable files existing child to point to a different object)
* the contents of mutable files
Obviously if you query for information about the file store and then act Obviously if you query for information about the file store and then act
to change it (such as by getting a listing of the contents of a mutable to change it (such as by getting a listing of the contents of a mutable

View File

@ -23,8 +23,9 @@ Contents:
frontends/download-status frontends/download-status
known_issues known_issues
../.github/CONTRIBUTING contributing
CODE_OF_CONDUCT CODE_OF_CONDUCT
release-checklist
servers servers
helper helper

View File

@ -40,23 +40,31 @@ Create Branch and Apply Updates
- Create a branch for release-candidates (e.g. `XXXX.release-1.15.0.rc0`) - Create a branch for release-candidates (e.g. `XXXX.release-1.15.0.rc0`)
- run `tox -e news` to produce a new NEWS.txt file (this does a commit) - run `tox -e news` to produce a new NEWS.txt file (this does a commit)
- create the news for the release - create the news for the release
- newsfragments/<ticket number>.minor - newsfragments/<ticket number>.minor
- commit it - commit it
- manually fix NEWS.txt - manually fix NEWS.txt
- proper title for latest release ("Release 1.15.0" instead of "Release ...post1432") - proper title for latest release ("Release 1.15.0" instead of "Release ...post1432")
- double-check date (maybe release will be in the future) - double-check date (maybe release will be in the future)
- spot-check the release notes (these come from the newsfragments - spot-check the release notes (these come from the newsfragments
files though so don't do heavy editing) files though so don't do heavy editing)
- commit these changes - commit these changes
- update "relnotes.txt" - update "relnotes.txt"
- update all mentions of 1.14.0 -> 1.15.0 - update all mentions of 1.14.0 -> 1.15.0
- update "previous release" statement and date - update "previous release" statement and date
- summarize major changes - summarize major changes
- commit it - commit it
- update "CREDITS" - update "CREDITS"
- are there any new contributors in this release? - are there any new contributors in this release?
- one way: git log release-1.14.0.. | grep Author | sort | uniq - one way: git log release-1.14.0.. | grep Author | sort | uniq
- commit it - commit it
- update "docs/known_issues.rst" if appropriate - update "docs/known_issues.rst" if appropriate
- update "docs/INSTALL.rst" references to the new release - update "docs/INSTALL.rst" references to the new release
- Push the branch to github - Push the branch to github
@ -82,21 +90,32 @@ they will need to evaluate which contributors' signatures they trust.
- (all steps above are completed) - (all steps above are completed)
- sign the release - sign the release
- git tag -s -u 0xE34E62D06D0E69CFCA4179FFBDE0D31D68666A7A -m "release Tahoe-LAFS-1.15.0rc0" tahoe-lafs-1.15.0rc0 - git tag -s -u 0xE34E62D06D0E69CFCA4179FFBDE0D31D68666A7A -m "release Tahoe-LAFS-1.15.0rc0" tahoe-lafs-1.15.0rc0
- (replace the key-id above with your own) - (replace the key-id above with your own)
- build all code locally - build all code locally
- these should all pass: - these should all pass:
- tox -e py27,codechecks,docs,integration - tox -e py27,codechecks,docs,integration
- these can fail (ideally they should not of course): - these can fail (ideally they should not of course):
- tox -e deprecations,upcoming-deprecations - tox -e deprecations,upcoming-deprecations
- build tarballs - build tarballs
- tox -e tarballs - tox -e tarballs
- confirm it at least exists: - confirm it at least exists:
- ls dist/ | grep 1.15.0rc0 - ls dist/ | grep 1.15.0rc0
- inspect and test the tarballs - inspect and test the tarballs
- install each in a fresh virtualenv - install each in a fresh virtualenv
- run `tahoe` command - run `tahoe` command
- when satisfied, sign the tarballs: - when satisfied, sign the tarballs:
- gpg --pinentry=loopback --armor --detach-sign dist/tahoe_lafs-1.15.0rc0-py2-none-any.whl - gpg --pinentry=loopback --armor --detach-sign dist/tahoe_lafs-1.15.0rc0-py2-none-any.whl
- gpg --pinentry=loopback --armor --detach-sign dist/tahoe_lafs-1.15.0rc0.tar.bz2 - gpg --pinentry=loopback --armor --detach-sign dist/tahoe_lafs-1.15.0rc0.tar.bz2
- gpg --pinentry=loopback --armor --detach-sign dist/tahoe_lafs-1.15.0rc0.tar.gz - gpg --pinentry=loopback --armor --detach-sign dist/tahoe_lafs-1.15.0rc0.tar.gz
@ -129,6 +148,7 @@ need to be uploaded to https://tahoe-lafs.org in `~source/downloads`
https://tahoe-lafs.org/downloads/ on the Web. https://tahoe-lafs.org/downloads/ on the Web.
- scp dist/*1.15.0* username@tahoe-lafs.org:/home/source/downloads - scp dist/*1.15.0* username@tahoe-lafs.org:/home/source/downloads
- the following developers have access to do this: - the following developers have access to do this:
- exarkun - exarkun
- meejah - meejah
- warner - warner
@ -137,8 +157,9 @@ For the actual release, the tarball and signature files need to be
uploaded to PyPI as well. uploaded to PyPI as well.
- how to do this? - how to do this?
- (original guide says only "twine upload dist/*") - (original guide says only `twine upload dist/*`)
- the following developers have access to do this: - the following developers have access to do this:
- warner - warner
- exarkun (partial?) - exarkun (partial?)
- meejah (partial?) - meejah (partial?)

0
newsfragments/3536.minor Normal file
View File

View File

@ -221,6 +221,7 @@ commands =
deps = deps =
sphinx sphinx
docutils==0.12 docutils==0.12
recommonmark
# normal install is not needed for docs, and slows things down # normal install is not needed for docs, and slows things down
skip_install = True skip_install = True
commands = commands =