Merge remote-tracking branch 'origin/trunk' into src-move-8214-5

zizhong · Jul 23, 2016 · 59709f6 · 59709f6
2 parents 2010039 + fc120b8
commit 59709f6
Show file tree

Hide file tree

Showing 270 changed files with 4,293 additions and 1,420 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.o
 *.py[co]
 *.so
+*.DS_Store
 _trial_temp*/
 build/
 dropin.cache

diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,51 @@
+#
+# This is the Travis-CI configuration.
+#
+# The actual dependency installation and test execution is done via tox as a
+# way to share the same process between Travis-CI and Buildbot.
+#
 language: python
 sudo: false
 
+env:
+  global:
+    - TRIAL_REPORTER=text
+
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=py27-coverage-posix,codecov-publish
+    # FIXME: https://twistedmatrix.com/trac/ticket/8633
+    # Coverage should also be reported for nomodules tests so that we also
+    # get report for those conditional branches.
+    - python: 2.7
+      env: TOXENV=py27-nomodules-posix
+    - python: 3.3
+      env: TOXENV=py33-coverage-posix,codecov-publish
+    - python: 3.4
+      env: TOXENV=py34-coverage-posix,codecov-publish
+    - python: 3.5
+      env: TOXENV=py35-coverage-posix,codecov-publish
+    # For now all non-trial tests are in a single job to reduce the time spent
+    # on starting separate jobs.
+    - python: 2.7
+      env: TOXENV=narrativedocs,apidocs,pyflakes,topfile,manifest-checker
+    #
+    # OSX 10.10
+    #
+    - language: generic
+      os: osx
+      # 7.1 is OS X 10.10.x
+      # see: https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions
+      osx_image: xcode7.1
+      python: 2.7
+      env: TOXENV=py27-coverage-posix,codecov-publish
+
+  allow_failures:
+    # For now, OSX run on Travis-CI has a few failures.
+    - os: osx
+
+
 addons:
   apt:
     packages:
@@ -11,19 +56,8 @@ cache:
   directories:
     - $HOME/.cache/pip
 
-python:
-  - "2.7"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-
-env:
-  global:
-    - TRIAL_REPORTER=text
-
 install:
-  - pip install tox tox-travis
-
+  - ./.travis/install.sh tox
 
 # FIXME: https://twistedmatrix.com/trac/ticket/8373
 # By default, Travis only clones one branch.
@@ -33,5 +67,6 @@ before_script:
   - git remote set-branches --add origin trunk
   - git fetch origin trunk
 
+# Run tox from the created virtualenv.
 script:
-  - tox
+  - ./.travis/run.sh
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+set -x
+
+if [[ "$(uname -s)" == 'Darwin' ]]; then
+    curl -O https://bootstrap.pypa.io/get-pip.py
+    python get-pip.py --user
+    python -m pip install --user virtualenv
+    python -m virtualenv ~/.venv
+    source ~/.venv/bin/activate
+fi
+
+pip install $@
diff --git a/.travis/run.sh b/.travis/run.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+set -x
+
+if [[ "$(uname -s)" == "Darwin" ]]; then
+    # Initialize the virtualenv created at install time.
+    source ~/.venv/bin/activate
+fi
+
+tox -- $TOX_FLAGS
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -17,15 +17,18 @@ recursive-include docs README
 include NEWS README.rst INSTALL.rst CONTRIBUTING LICENSE code_of_conduct.md
 
 # Exclude admin scripts and things only useful when running from a source checkout
-exclude bin/_preamble.py
-exclude admin
-exclude bin/admin
-recursive-exclude admin *
-recursive-exclude bin/admin *
+exclude codecov.yml
+exclude appveyor.yml
+prune bin
+prune admin
+prune .travis
 
 # Include test-running utilities for downstream packagers
 include tox.ini .coveragerc
 
+# Include our docs templates
+recursive-include twisted/python/_pydoctortemplates *.html
+
 # Python 3 setup file
 include setup3.py
 

diff --git a/NEWS b/NEWS
@@ -567,8 +567,7 @@ No significant changes have been made for this release.
 Twisted Core 15.5.0 (2015-11-28)
 ================================
 
-This is the last Twisted release where Python 2.6 is supported, on any
-platform. Python 3.5 (on POSIX) support has been added.
+Python 3.5 (on POSIX) support has been added.
 
 This release introduces changes that are required for Conch's SSH
 implementation to work with OpenSSH 6.9+ servers.
@@ -740,6 +739,9 @@ Other
 Twisted Core 15.4.0 (2015-09-04)
 ================================
 
+This is the last Twisted release where Python 2.6 is supported, on any
+platform. 
+
 Features
 --------
  - Trial has been ported to Python 3. (#5965)
@@ -4487,7 +4489,7 @@ Bugfixes
    intermittent error, crashing at startup with a ZeroDivisionError
    while trying to report progress. (#4463)
  - twisted.conch.ssh.connection.SSHConnection now replies to requests
-   to open an unknown channel with a OPEN_UNKNOWN_CHANNEL_TYPE message
+   to open an unknown channel with an OPEN_UNKNOWN_CHANNEL_TYPE message
    instead of closing the connection. (#4490)
 
 Deprecations and Removals

diff --git a/README.rst b/README.rst
@@ -4,6 +4,7 @@ Twisted 16.3.0
 |pypi|
 |coverage|
 |travis|
+|appveyor|
 
 .. code::
 
@@ -110,3 +111,6 @@ Again, see the included `LICENSE <LICENSE>`_ file for specific legal details.
 
 .. |travis| image:: https://travis-ci.org/twisted/twisted.svg?branch=trunk
 .. _travis https://travis-ci.org/twisted/twisted
+
+.. |appveyor| image:: https://ci.appveyor.com/api/projects/status/x4oyqtl9cqc2i2l8
+.. _appveyor https://ci.appveyor.com/project/adiroiban/twisted
diff --git a/appveyor.yml b/appveyor.yml
@@ -0,0 +1,58 @@
+#
+# Some help for Python on AppVeyor:
+# * https://packaging.python.org/appveyor/
+# * https://ci.appveyor.com/tools/validate-yaml
+
+version: '{branch}-{build}'
+
+# No need for Python.
+build: off
+# We don't report the test in XUnit tests or any other format supported by
+# AppVeyor.
+test: off
+
+# Don't build branch if there is an open PR, to prevent double builds.
+# For now, Appveyour will only build PR commits and not commits to master or
+# commits on random branches without an associated PR.
+skip_branch_with_pr: true
+
+# Not sure if the cache works.
+# Note the use of single quotes around the entire line, when environment
+# variables are used.
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
+
+
+environment:
+  global:
+    TRIAL_REPORTER: text
+
+  # Only use pre-installed Python versions, which Appveyor may upgrade to
+  # a later point release.
+  # See: http://www.appveyor.com/docs/installed-software#python
+  matrix:
+    - PYTHON: C:\Python27-x64
+      TOXENV: py27-coverage-windows,codecov-publish
+
+# Some tests are failing on Appveyor and they will be fixed in a separate
+# ticket.
+matrix:
+  allow_failures:
+    - PYTHON: C:\Python27-x64
+
+install:
+  # Get some information about the build environment.
+  # Uncomment them. Left here so that you don't have to search the net for
+  # how to run such command on Windows :)
+  # - ps: "ls \"C:/\""
+  # - ps: "ls \"C:/Program Files/Microsoft SDKs/Windows\""
+  # - ps: echo $env:PYTHON $env:TOXENV
+  # Check that we have the expected version and architecture for Python
+  - "%PYTHON%\\python --version"
+  - "%PYTHON%\\python -c \"import struct; print(struct.calcsize('P') * 8)\""
+
+  # The build system itself is handled by tox.
+  - "%PYTHON%\\Scripts\\pip install tox"
+
+test_script:
+  - "%PYTHON%\\python -m tox -e %TOXENV%"
diff --git a/bin/cftp b/bin/cftp
diff --git a/bin/ckeygen b/bin/ckeygen
diff --git a/bin/conch b/bin/conch
diff --git a/bin/mailmail b/bin/mailmail
diff --git a/bin/pyhtmlizer b/bin/pyhtmlizer
diff --git a/bin/tkconch b/bin/tkconch
diff --git a/bin/twistd b/bin/twistd
diff --git a/docs/conch/howto/conch_client.rst b/docs/conch/howto/conch_client.rst
@@ -148,7 +148,7 @@ The ``agentEndpoint`` argument gives the ``SSHCommandClientEndpoint`` an opportu
 The agent may already be loaded with keys, or may have some other way to authenticate a connection.
 Using the agent can mean the process actually establishing the SSH connection doesn't need to load any authentication material (passwords or keys) itself (often convenient in case keys are encrypted and potentially more secure, since only the agent process ever actually holds the secrets).
 The value for this argument is another ``IStreamClientEndpoint`` .
-Often in a typical *NIX desktop environment, the *SSH_AUTH_SOCK* environment variable will give the location of a AF_UNIX socket.
+Often in a typical *NIX desktop environment, the *SSH_AUTH_SOCK* environment variable will give the location of an AF_UNIX socket.
 This explains the value ``echoclient_ssh.py`` assigns this parameter when *--no-agent* is not given.
 
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -302,7 +302,7 @@
 # The scheme of the identifier. Typical schemes are ISBN or URL.
 #epub_scheme = ''
 
-# The unique identifier of the text. This can be a ISBN number
+# The unique identifier of the text. This can be an ISBN number
 # or the project homepage.
 #epub_identifier = ''
 

diff --git a/docs/core/development/policy/compatibility-policy.rst b/docs/core/development/policy/compatibility-policy.rst
@@ -304,7 +304,7 @@ How to deprecate APIs
 Classes
 ^^^^^^^
 
-Classes are deprecated by raising an warning when they are access from within their module, using the :api:`twisted.python.deprecate.deprecatedModuleAttribute <deprecatedModuleAttribute>` helper.
+Classes are deprecated by raising a warning when they are access from within their module, using the :api:`twisted.python.deprecate.deprecatedModuleAttribute <deprecatedModuleAttribute>` helper.
 
 .. code-block:: python
 

diff --git a/docs/core/development/policy/writing-standard.rst b/docs/core/development/policy/writing-standard.rst
@@ -311,7 +311,7 @@ that they will see the document do. For example:
       backend;
     - creating an anonymous access read-only SFTP server using a proxy
       backend connecting to an HTTP server; and
-    - creating a anonymous access read and write SFTP server using a
+    - creating an anonymous access read and write SFTP server using a
       filesystem backend.
-Original file line number
+Diff line change
@@ Expand Up / @@ -304,7 +304,7 @@ How to deprecate APIs @@
     Classes
     ^^^^^^^
-    Classes are deprecated by raising an warning when they are access from within their module, using the :api:`twisted.python.deprecate.deprecatedModuleAttribute <deprecatedModuleAttribute>` helper.
+    Classes are deprecated by raising a warning when they are access from within their module, using the :api:`twisted.python.deprecate.deprecatedModuleAttribute <deprecatedModuleAttribute>` helper.
     .. code-block:: python
@@ Expand Down @@