Merge branch 'trunk' into 9192-dmollerm-reverse_proxy_resource_docstring

chevah · Nov 10, 2018 · 1bc518e · 1bc518e
2 parents 21a9bb7 + ad90045
commit 1bc518e
Show file tree

Hide file tree

Showing 138 changed files with 10,587 additions and 6,302 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -44,16 +44,6 @@ jobs:
           when: always
           command: |
             tox -r -e manifest-checker
-      - run:
-          name: Check pyflakes.
-          when: always
-          command: |
-            tox -r -e pyflakes
-      - run:
-          name: Check pycodestyle diff with trunk.
-          when: always
-          command: |
-            tox -r -e pycodestylediff
 
   #
   # Documentation tests are slow so we execute them in a separate job.
@@ -84,36 +74,9 @@ jobs:
           command: |
             tox -r -e apidocs
 
-
-  #
-  # We run pyflakes with Python 3 .
-  #
-  pyflakes3:
-    working_directory: ~/pyflakes3
-    docker:
-      - image: circleci/python:3.6
-    steps:
-      # Get the source.
-      - checkout
-
-      - run:
-          name: Prepare the environment.
-          command: |
-            python --version
-            pip install -q --user --ignore-installed --upgrade virtualenv
-            pip install -q tox --user
-            echo 'export PATH=~/.local/bin:$PATH' >> $BASH_ENV
-
-      - run:
-          name: Check the API documentation.
-          command: |
-            tox -r -e pyflakes3
-
-
 workflows:
   version: 2
   all-tests:
     jobs:
       - static_checkers
       - documentation
-      - pyflakes3
diff --git a/.travis.yml b/.travis.yml
@@ -33,8 +33,12 @@ matrix:
       env: TOXENV=py35-alldeps-withcov-posix,codecov-publish
     - python: 3.6
       env: TOXENV=py36-alldeps-withcov-posix,codecov-publish
+    - python: 3.7
+      env: TOXENV=py37-alldeps-withcov-posix,codecov-publish
+      dist: xenial
+      sudo: true
     - python: 3.5
-      env: TOXENV=txchecker-travis-required
+      env: TOXENV=lint
     # We need a builder without IPv6. This is going to be slower than all the
     # others, but that's ok.
     - python: 3.6

diff --git a/INSTALL.rst b/INSTALL.rst
@@ -6,7 +6,7 @@ Installation Requirements
 
 To install Twisted, you need:
 
-- Python 2.7 (full functionality) or 3.4/3.5/3.6 (subset of functionality).
+- Python 2.7 (full functionality) or 3.4/3.5/3.6/3.7 (subset of functionality).
 
 - `setuptools <https://pypi.python.org/pypi/setuptools>`_
   (installed automatically if you use pip).

diff --git a/LICENSE b/LICENSE
@@ -10,6 +10,7 @@ Benjamin Bruheim
 Bob Ippolito
 Canonical Limited
 Christopher Armstrong
+Ciena Corporation
 David Reid
 Divmod Inc.
 Donovan Preston