Merge branch 'master' into j1

Author: bmwiedemann

.travis.yml

@@ -1,10 +1,58 @@
 language: python
+dist: xenial
+
+stages:
+- baseline
+- name: test
+  if: repo = pytest-dev/execnet AND tag IS NOT present
+- name: deploy
+  if: repo = pytest-dev/execnet AND tag IS present
+
 python:
-  - '2.7'
-  - '3.4'
-  - '3.5'
-  - '3.6'
-  - 'pypy'
+  - '3.7'
+
+jobs:
+  include:
+    - stage: baseline
+      env: TOXENV=docs
+      python: '3.6'
+    - env: TOXENV=py27
+      python: '2.7'
+    - env: TOXENV=py37
+      python: '3.7'
+
+    - stage: test
+      env: TOXENV=py34
+      python: '3.4'
+    - env: TOXENV=py35
+      python: '3.5'
+    - env: TOXENV=py36
+      python: '3.6'
+    - env: TOXENV=pypy
+      python: 'pypy2.7-6.0'
+    - env: TOXENV=pypy3
+      python: 'pypy3.5-6.0'
+
+    - stage: deploy
+      python: '3.7'
+      install: pip install -U setuptools setuptools_scm
+      script: skip
+      deploy:
+        provider: pypi
+        user: nicoddemus
+        distributions: sdist bdist_wheel
+        skip_upload_docs: true
+        password:
+          secure: "l+Khw6WjS1tX+jQ2sGLneAXB7iRKctBx1SnU9jCnRHj1VEN3FhNSKkwaHOvUM56WaPS8Z6KZeDzd4qk0o8bSz+ee+ofpODX+ueherWh3I5pBXdgVC9mpFO5hznBxqSDE/9dvCfPnjed8FE3uMICLxB+0A45zZONaMp1SWSTorOJ7t6MJ9YJwefiCW2Jsw8qcNDJlF2jUzfpOOOMhN824v9R57/o8UnXle9RwqqClq/7OMNqDtFGdYbbLgxoS7RxiknyJ+kRG95bxF/lknPcRrOkpSL+xNcweiFA/cNlz/JQrh6j7HCvUfQYkHAT64CuderUcAHOLhwTDf56j6DSoArxrNKN8vg0wsMqw9wpHI/MmSrw0LMN8MpHXRF902K+DPgxn/yNyJTKR4E3ZZEpJDIYf3Z1K15I2Px/K11r42wP3ulo6yEX7PX6qgPgsRhQuiI8MLrdFnfAjSSWunUsIUGOzO5q/gzaFLT8XlIGI6exuUlyYJfu9Fhtd3PSuEUnxuvEbWLrhOTUfCtVdq9aNV0NiF1bVjPcA0UawD5XUzH7rfBXbkcSHK12C/HzOGUR5UlNeiHnOSVx7FBy7OqbS7/5aBYWtkrAB1cIuhNLJSjOCzGphKvjQtxBja1iJk0atSS4kEKra723rlOZZ6r75bdL9QhB/P5YEnWTIVMbkPZ0="
+        on:
+          tags: true
+          repo: pytest-dev/execnet
+  allow_failures:
+  - env: TOXENV=pypy
+    python: 'pypy2.7-6.0'
+  - env: TOXENV=pypy3
+    python: 'pypy3.5-6.0'
+
 
 matrix:
   include:
@@ -14,8 +62,8 @@ matrix:
     - python: 'pypy'
 
 install:
-  - pip install -U pip setuptools setuptools_scm
-  - pip install -U tox-travis
+  - pip install -U pip
+  - pip install -U setuptools setuptools_scm tox
 
 script:
   - tox

CHANGELOG.rst

@@ -1,12 +1,14 @@
-1.6.0 (unreleased)
+1.6.0 (2019-03-31)
 ------------------
 
 * ``execnet`` no longer supports Python 2.6 and 3.3 (#85). Users of those Python versions
   using a recent enough ``pip`` should not be affected, as ``pip`` will only install
   ``1.5.0`` for them.
 
-1.5.0
------
+* Update test suite to support ``pytest>4``.
+
+1.5.0 (2017-10-16)
+------------------
 
 - support shell escaping in python pathnames of popen.
 
@@ -34,8 +36,8 @@
 
 - fix spec parsing on Windows due to path containing '\' characters.
 
-1.4.1
-------
+1.4.1 (2015-09-02)
+------------------
 
 - fix a regression of the Serializer created by the implied opcode ordering
   which resulted in a incompatible opcode mapping

HOWTORELEASE.rst

@@ -0,0 +1,37 @@
+=================
+Releasing execnet
+=================
+
+This document describes the steps to make a new ``execnet`` release.
+
+Version
+-------
+
+``master`` should always be green and a potential release candidate. ``execnet`` follows
+semantic versioning, so given that the current version is ``X.Y.Z``, to find the next version number
+one needs to look at the ``CHANGELOG.rst`` file:
+
+- If there any new feature, then we must make a new **minor** release: next
+  release will be ``X.Y+1.0``.
+
+- Otherwise it is just a **bug fix** release: ``X.Y.Z+1``.
+
+
+Steps
+-----
+
+To publish a new release ``X.Y.Z``, the steps are as follows:
+
+#. Create a new branch named ``release-X.Y.Z`` from the latest ``master``.
+
+#. Update the ``CHANGELOG.rst`` file with the new release information.
+
+#. Commit and push the branch for review.
+
+#. Once PR is **green** and **approved**, create and push a tag::
+
+    $ export VERSION=X.Y.Z
+    $ git tag v$VERSION release-$VERSION
+    $ git push [email protected]:pytest-dev/execnet.git v$VERSION
+
+That will build the package and publish it on ``PyPI`` automatically.

appveyor.yml

@@ -5,6 +5,7 @@ environment:
   - TOXENV: "py34"
   - TOXENV: "py35"
   - TOXENV: "py36"
+  - TOXENV: "py37"
   - TOXENV: "pypy"
   - TOXENV: "docs"
 
@@ -18,7 +19,7 @@ install:
 
   - if "%TOXENV%" == "pypy" call scripts\install-pypy.bat
 
-  - C:\Python36\python -m pip install tox
+  - C:\Python37\python -m pip install tox
 
 test_script:
-  - C:\Python36\python -m tox
+  - C:\Python37\python -m tox

doc/conf.py

@@ -98,10 +98,8 @@
 
 # html_index = 'index.html'
 html_sidebars = {
-    'index': 'indexsidebar.html',
+    'index': ['indexsidebar.html'],
 }
-#                 'basics': 'indexsidebar.html',
-# }
 # html_additional_pages = {'index': 'index.html'}
 
 # Theme options are theme-specific and customize the look and feel of a theme

setup.py

@@ -27,6 +27,8 @@ def main():
             'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',
+            'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: Implementation :: CPython',
             'Programming Language :: Python :: Implementation :: PyPy',
             ],
         packages=['execnet', 'execnet.script'],

testing/test_rsync.py

@@ -45,7 +45,8 @@ class dirs:
 class TestRSync:
     def test_notargets(self, dirs):
         rsync = RSync(dirs.source)
-        py.test.raises(IOError, "rsync.send()")
+        with pytest.raises(IOError):
+            rsync.send()
         assert rsync.send(raises=False) is None
 
     def test_dirsync(self, dirs, gw1, gw2):

tox.ini

@@ -1,11 +1,12 @@
 [tox]
-envlist=py27,py34,py35,py36,pypy
+envlist=py27,py34,py35,py36,py37,pypy,pypy3
 
 [testenv]
 deps=
     pytest
     pytest-timeout
-commands=pytest {posargs:testing}
+commands=
+    pytest {posargs:testing}
 
 [testenv:docs]
 skipsdist = True