diff options
-rw-r--r-- | .github/workflows/ci-tests.yml | 4 | ||||
-rw-r--r-- | CHANGES.txt | 2 | ||||
-rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
-rw-r--r-- | README.rst | 6 | ||||
-rw-r--r-- | RELEASING.txt | 4 | ||||
-rw-r--r-- | contributing.md | 4 | ||||
-rw-r--r-- | docs/conf.py | 2 | ||||
-rw-r--r-- | docs/index.rst | 2 | ||||
-rw-r--r-- | docs/runner.rst | 2 | ||||
-rw-r--r-- | docs/usage.rst | 2 | ||||
-rw-r--r-- | src/waitress/parser.py | 2 | ||||
-rw-r--r-- | src/waitress/server.py | 2 | ||||
-rw-r--r-- | tests/test_functional.py | 4 |
13 files changed, 21 insertions, 17 deletions
diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 5a313c2..e6f5441 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -1,10 +1,10 @@ name: Build and test on: - # Only on pushes to master or one of the release branches we build on push + # Only on pushes to main or one of the release branches we build on push push: branches: - - master + - main - "[0-9].[0-9]+-branch" tags: # Build pull requests diff --git a/CHANGES.txt b/CHANGES.txt index 5ae6166..bd596c9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,8 @@ 3.0.0 (Unreleased) ------------------ +- Rename "master" git branch to "main" + Updated Defaults ~~~~~~~~~~~~~~~~ diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 6d6df5d..462ea24 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -146,3 +146,5 @@ Contributors - Jack Wearden, 2018-05-18 - Frank Krick, 2018-10-29 + +- Jonathan Vanasco, 2022-11-15 @@ -8,9 +8,9 @@ Waitress .. image:: https://github.com/Pylons/waitress/workflows/Build%20and%20test/badge.svg :target: https://github.com/Pylons/waitress/actions?query=workflow%3A%22Build+and+test%22 -.. image:: https://readthedocs.org/projects/waitress/badge/?version=master - :target: https://docs.pylonsproject.org/projects/waitress/en/master - :alt: master Documentation Status +.. image:: https://readthedocs.org/projects/waitress/badge/?version=main + :target: https://docs.pylonsproject.org/projects/waitress/en/main + :alt: main Documentation Status .. image:: https://img.shields.io/badge/irc-freenode-blue.svg :target: https://webchat.freenode.net/?channels=pyramid diff --git a/RELEASING.txt b/RELEASING.txt index 1306098..1c428cb 100644 --- a/RELEASING.txt +++ b/RELEASING.txt @@ -49,8 +49,8 @@ Prepare new release $ twine upload dist/waitress-X.X-* -Prepare master for further development (major releases only) ------------------------------------------------------------- +Prepare main for further development (major releases only) +---------------------------------------------------------- - In CHANGES.txt, preserve headings but clear out content. Add heading "unreleased" for the version number. diff --git a/contributing.md b/contributing.md index 6bdfb52..af8dfa4 100644 --- a/contributing.md +++ b/contributing.md @@ -23,7 +23,7 @@ To respect both your time and ours, we emphasize the following points. Git branches ------------ -There is a single branch [master](https://github.com/Pylons/waitress/) on which development takes place and from which releases to PyPI are tagged. This is the default branch on GitHub. +There is a single branch [main](https://github.com/Pylons/waitress/) on which development takes place and from which releases to PyPI are tagged. This is the default branch on GitHub. Running tests and building documentation @@ -81,7 +81,7 @@ Contributing documentation 6. From this point forward, follow the typical [git workflow](https://help.github.com/articles/what-is-a-good-git-workflow/). Start by pulling from the upstream to get the most current changes. - git pull upstream master + git pull upstream main 7. Make a branch, make changes to the docs, and rebuild them as indicated in step 5. To speed up the build process, you can omit `clean` from the above command to rebuild only those pages that depend on the files you have changed. diff --git a/docs/conf.py b/docs/conf.py index cf0ff9b..392bde9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -41,7 +41,7 @@ templates_path = ["_templates"] # The suffix of source filenames. source_suffix = ".rst" -# The master toctree document. +# The main toctree document. master_doc = "index" # General substitutions. diff --git a/docs/index.rst b/docs/index.rst index ba34b5e..2081778 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -62,7 +62,7 @@ To check out the trunk via ``git``, use this command: git clone git@github.com:Pylons/waitress.git -To find out how to become a contributor to Waitress, please see the guidelines in `contributing.md <https://github.com/Pylons/waitress/blob/master/contributing.md>`_ and `How to Contribute Source Code and Documentation <https://pylonsproject.org/community-how-to-contribute.html>`_. +To find out how to become a contributor to Waitress, please see the guidelines in `contributing.md <https://github.com/Pylons/waitress/blob/main/contributing.md>`_ and `How to Contribute Source Code and Documentation <https://pylonsproject.org/community-how-to-contribute.html>`_. Why? ---- diff --git a/docs/runner.rst b/docs/runner.rst index 2776e44..70c0022 100644 --- a/docs/runner.rst +++ b/docs/runner.rst @@ -90,7 +90,7 @@ Common options: --listen=[::1]:8080 --listen=*:8080 - This option may be used multiple times to listen on multipe sockets. + This option may be used multiple times to listen on multiple sockets. A wildcard for the hostname is also supported and will bind to both IPv4/IPv6 depending on whether they are enabled or disabled. diff --git a/docs/usage.rst b/docs/usage.rst index dfcd6dc..0789ff1 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -57,7 +57,7 @@ Using ``host`` and ``port`` is also supported: host = 127.0.0.1 port = 8080 -The :term:`PasteDeploy` syntax for UNIX domain sockets is analagous: +The :term:`PasteDeploy` syntax for UNIX domain sockets is analogous: .. code-block:: ini diff --git a/src/waitress/parser.py b/src/waitress/parser.py index b31b5cc..dda2a90 100644 --- a/src/waitress/parser.py +++ b/src/waitress/parser.py @@ -126,7 +126,7 @@ class HTTPRequestParser: # Header finished. header_plus = s[:index] - # Remove preceeding blank lines. This is suggested by + # Remove preceding blank lines. This is suggested by # https://tools.ietf.org/html/rfc7230#section-3.5 to support # clients sending an extra CR LF after another request when # using HTTP pipelining diff --git a/src/waitress/server.py b/src/waitress/server.py index 0a0f876..0378d48 100644 --- a/src/waitress/server.py +++ b/src/waitress/server.py @@ -134,7 +134,7 @@ def create_server( # This class is only ever used if we have multiple listen sockets. It allows # the serve() API to call .run() which starts the wasyncore loop, and catches -# SystemExit/KeyboardInterrupt so that it can atempt to cleanly shut down. +# SystemExit/KeyboardInterrupt so that it can attempt to cleanly shut down. class MultiSocketServer: asyncore = wasyncore # test shim diff --git a/tests/test_functional.py b/tests/test_functional.py index 1dfd889..a64dd91 100644 --- a/tests/test_functional.py +++ b/tests/test_functional.py @@ -105,8 +105,8 @@ class SubprocessTests: # The following is for the benefit of PyPy 3, for some reason it is # holding on to some resources way longer than necessary causing tests - # to fail with file desctriptor exceeded errors on macOS which defaults - # to 256 file desctriptors per process. While we could use ulimit to + # to fail with file descriptor exceeded errors on macOS which defaults + # to 256 file descriptors per process. While we could use ulimit to # increase the limits before running tests, this works as well and # means we don't need to remember to do that. import gc |