Merge branch 'master' into transition-graph

Conflicts:
	magicbus/base.py
	magicbus/process.py
	magicbus/test/test_processbus.py

Author: aminusfu

.readthedocs.yml

@@ -0,0 +1,5 @@
+python:
+  version: 3
+  extra_requirements:
+    - docs
+  pip_install: true

.travis.yml

@@ -1,149 +1,19 @@
-language: python
-
-os: linux
 dist: trusty
-
 sudo: false
-group: edge
-
-_base_envs:
-- &stage_lint
-  stage: &stage_lint_name lint
-- &stage_test_priority
-  stage: &stage_test_priority_name test against latest Python versions first (under GNU/Linux)
-- &stage_test_osx
-  stage: &stage_test_osx_name test under OS X (last chance to fail before deploy available)
-- &stage_deploy
-  stage: &stage_deploy_name upload new version of python package to PYPI (only for tagged commits)
-- &pyenv_base
-  language: generic
-  python: &pypy2 pypy2.7-5.8.0
-  env:
-  - &env_pypy2 PYTHON_VERSION=pypy2.7-5.8.0
-  - &env_pyenv PYENV_ROOT="$HOME/.pyenv"
-  - &env_path PATH="$PYENV_ROOT/bin:$PATH"
-  before_install:
-  - &ensure_pyenv_installed |
-    if [ ! -f "$PYENV_ROOT/bin/pyenv" ]
-    then
-      rm -rf "$PYENV_ROOT"
-      curl -L https://raw.githubusercontent.com/pyenv/pyenv-installer/master/bin/pyenv-installer | bash
-      eval "$(pyenv init -)"
-      eval "$(pyenv virtualenv-init -)"
-    fi
-    eval "$(pyenv init -)"
-    eval "$(pyenv virtualenv-init -)"
-    pyenv update
-  - &install_python pyenv install --skip-existing --keep --verbose "$PYTHON_VERSION"
-  - &switch_python pyenv shell "$PYTHON_VERSION"
-  - &python_version python --version
-- &osx_python_base
-  <<: *pyenv_base
-  <<: *stage_test_osx
-  os: osx
-  language: generic
-  before_install:
-  - brew update
-  - brew install readline xz
-  - *ensure_pyenv_installed
-  - *install_python
-  - *switch_python
-  - *python_version
-  before_cache:
-  - brew --cache
-- &pure_python_base_priority
-  <<: *stage_test_priority
-  python: &mainstream_python 3.6
-- &lint_python_base
-  <<: *stage_lint
-  python: *mainstream_python
-  after_failure: []
-
-stages:
-- *stage_lint_name
-- *stage_test_priority_name
-- test
-- *stage_test_osx_name
-- name: *stage_deploy_name
-  if: tag IS present
+language: python
 
-# Base test matrix run in linux containers:
-python:
-- 2.7
-- 3.3
-- 3.4
-- 3.5
-- *mainstream_python
-- *pypy2
-- &pypy3 pypy3.5-5.8.0
+matrix:
+  allow_failures:
+  - python: 3.6
 
 jobs:
   fast_finish: true
-  allow_failures:
-  - env: &pep257_env TOXENV=pre-commit-pep257
-  - env: &pre-commit_env TOXENV=pre-commit
-  # pypy2.7 succeeds locally
-  - python: *pypy2
-    os: linux
-  # pypy3.5 fails locally like in Travis
-  - python: *pypy3
-    os: linux
-  # OS X environment is extremely unstable
-  - os: linux
   include:
-  - <<: *lint_python_base
-    env: *pre-commit_env
-  - <<: *lint_python_base
-    env: *pep257_env
-  - <<: *pure_python_base_priority
-    # mainstream here (3.6)
-  - <<: *pure_python_base_priority
-    python: nightly
-  - <<: *osx_python_base
-    python: 2.7
-    env:
-    - PYTHON_VERSION=2.7.13
-    - *env_pyenv
-    - *env_path
-  - <<: *osx_python_base
-    python: 3.3
-    env:
-    - PYTHON_VERSION=3.3.6
-    - *env_pyenv
-    - *env_path
-  - <<: *osx_python_base
-    python: 3.4
-    env:
-    - PYTHON_VERSION=3.4.6
-    - *env_pyenv
-    - *env_path
-  - <<: *osx_python_base
-    python: 3.5
-    env:
-    - PYTHON_VERSION=3.5.3
-    - *env_pyenv
-    - *env_path
-  - <<: *osx_python_base
-    python: *mainstream_python
-    env:
-    - PYTHON_VERSION=3.6.1
-    - *env_pyenv
-    - *env_path
-  - <<: *osx_python_base
-    python: nightly
-    env:
-    - PYTHON_VERSION=3.7-dev
-    - *env_pyenv
-    - *env_path
-  - <<: *osx_python_base
-    python: *pypy2
-    env:
-    - *env_pypy2
-    - *env_pyenv
-    - *env_path
-  # pypy3.5-5.8.0 fails under OS X because it's unsupported (PR #26)
-  - <<: *stage_deploy
-    python: *mainstream_python
+  - python: &latest_stable 2.7
+  - python: &latest_py3 3.6
+  - stage: deploy
+    if: tag IS present
+    python: *latest_stable
     install: skip
     script: skip
     deploy:
@@ -152,25 +22,15 @@ jobs:
         tags: true
         all_branches: true
       user: jaraco
-      distributions: bdist_wheel sdist
       password:
         secure: rGooTu2PXDe+83QGlXVyfrMFZkUJ78qNMj6TRpLDz1Mb+SEx9HazxxrcURtNBemHlx9bebUYV0Ue2xgkK4vUFw2vyD3WVaXBJTQQkkKsGlUZy27NgOqqNxR3igQqloM1oVg7+NZqRvuAhoTTkhA9btp7l6CZ4tp8JfljO9b9TAw=
+      distributions: dists
+      skip_cleanup: true
+      skip_upload_docs: true
 
-cache:
-  pip: true
-  directories:
-  - $HOME/.pre-commit
-  - $HOME/Library/Caches/Homebrew
+cache: pip
 
 install:
-- pip install tox "setuptools>=28.2"
-
-script:
-- tox -e${TOXENV-python}
+- pip install tox
 
-after_failure:
-- echo "Here's a list of installed Python packages:"
-- pip list --format=columns
-- py_log=/home/travis/build/cherrypy/magicbus/.tox/python/log/python-0.log
-- echo Outputting python invocation log from $py_log
-- cat $py_log
+script: tox

CHANGES.rst

@@ -0,0 +1,4 @@
+v4.0.0
+======
+
+* First public release, based on CherryPy 3.2.2.

magicbus/LICENSE.txt renamed to LICENSE

@@ -1,25 +1,16 @@
-.. image:: https://img.shields.io/pypi/v/MagicBus.svg
-   :target: https://pypi.org/project/MagicBus
-
-.. image:: https://img.shields.io/travis/cherrypy/magicbus/master.svg?label=Linux%20build%20%40%20Travis%20CI
-   :target: http://travis-ci.org/cherrypy/magicbus
+.. image:: https://img.shields.io/pypi/v/magicbus.svg
+   :target: https://pypi.org/project/magicbus
 
 .. image:: https://img.shields.io/pypi/pyversions/magicbus.svg
 
-========
-MagicBus
-========
-
-* To install, change to the directory where setup.py is located and
-  type (python-2.7, python-3.3 or later needed):
-
-    python setup.py install
-
-* To run the regression tests, just go to the magicbus/test/ directory
-  and type:
+.. image:: https://img.shields.io/travis/cherrypy/magicbus/master.svg
+   :target: http://travis-ci.org/cherrypy/magicbus
 
-    nosetests -s ./
+The Process Bus is a publish/subscribe architecture that
+loosely connects components with services.
 
-  Or to run individual tests type:
+Testing
+=======
 
-    nosetests -s test_foo.py
+To run the test suite, install and run `tox
+<https://pypi.org/project/tox>`_.

README.rst

@@ -0,0 +1,21 @@
+environment:
+
+  APPVEYOR: true
+
+  matrix:
+    - PYTHON: "C:\\Python36-x64"
+    - PYTHON: "C:\\Python27-x64"
+
+install:
+  # symlink python from a directory with a space
+  - "mklink /d \"C:\\Program Files\\Python\" %PYTHON%"
+  - "SET PYTHON=\"C:\\Program Files\\Python\""
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+
+build: off
+
+test_script:
+  - "python -m pip install tox"
+  - "tox"
+
+version: '{build}'

appveyor.yml

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+extensions = [
+    'sphinx.ext.autodoc',
+    'jaraco.packaging.sphinx',
+    'rst.linker',
+]
+
+master_doc = 'index'
+
+link_files = {
+    '../CHANGES.rst': dict(
+        using=dict(
+            GH='https://github.com',
+        ),
+        replace=[
+            dict(
+                pattern=r'(Issue )?#(?P<issue>\d+)',
+                url='{package_url}/issues/{issue}',
+            ),
+            dict(
+                pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
+                with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',
+            ),
+            dict(
+                pattern=r'PEP[- ](?P<pep_number>\d+)',
+                url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
+            ),
+        ],
+    ),
+}

docs/conf.py

@@ -0,0 +1,8 @@
+:tocdepth: 2
+
+.. _changes:
+
+History
+*******
+
+.. include:: ../CHANGES (links).rst

docs/history.rst

@@ -0,0 +1,22 @@
+Welcome to skeleton documentation!
+========================================
+
+.. toctree::
+   :maxdepth: 1
+
+   history
+
+
+.. automodule:: skeleton
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+

docs/index.rst

@@ -18,4 +18,4 @@
     from magicbus.process import ProcessBus
 bus = ProcessBus()
 
-__all__ = ["ChannelFailures", "Bus", "ProcessBus", "bus"]
+__all__ = ['ChannelFailures', 'Bus', 'ProcessBus', 'bus']