Merge branch 'deduplicate' into channels2

Author: SmileyChris

.gitignore

@@ -9,6 +9,8 @@ __pycache__/
 # Distribution / packaging
 .Python
 env/
+venv/
+.venv/
 build/
 develop-eggs/
 dist/
@@ -42,7 +44,7 @@ htmlcov/
 .cache
 nosetests.xml
 coverage.xml
-*,cover
+*.cover
 .hypothesis/
 
 # Translations
@@ -63,6 +65,8 @@ target/
 .DS_Store
 
 .mypy_cache/
+
+.idea/
 .vscode/
 
-*.sqlite3
+*.sqlite3

.travis.yml

@@ -1,29 +1,18 @@
-# This file was autogenerated and will overwrite each time you run travis_pypi_setup.py
 deploy:
   provider: pypi
   distributions: sdist bdist_wheel
-  user: syrusakbary
+  user: __token__
   password:
-    secure: !!binary |
-      ekpBaVZYWWd6MXdRWXI4ZkovU2kwQVBEMGZneXl0Q3k3MTVSa3VvK3UvTm10V3hJZGs0V3ZNSFZG
-      T3lGK28ycDYvYUxwa2V0S1dVQmhONElSRlI2dWlhU1kzV0hQZ2N2ZFQ2MGk0TVFMSE5qWGZGelIx
-      T2pMOERxUG1PWFNRRytBRU1NeVhGT0xrZjg1ZnZocXFmUmxGZG1qZFVnZDBJQ0ZSUnZGS0toOGc5
-      OHJJTGVxMEVZWktuT1JneGJqdGF5Y05rVTlINnBNK09BV0xEeWpPK3JSVDRxSnluYldTUURmRUg1
-      SWNuN3Y2WEowa3RFYlcrSGxja0JWbVR4ZHpQcTNCZ2dWOHZiRnQxR3N1dkFicG5CZUJ5OGlaelhN
-      bWhnVGxReGtjZmVyMHZ1TFI1S2dQb3daNVA0ZThmaU0zd09aZlJZTTM1a3F4UGNqdndjRWZCNFl0
-      Q2JKcGxqYld2QTM5K3RVVzI4WWpvSDlOVGl0WlBTS3UrVVFCMEJuQXlJcTBQR3VseHoxNXdpcFM0
-      STVkcEVsalp6TnlHV04zd0dmemFPTmFBbklFbjZtVDRFWWdHVFRiUEYyL2h2bmxKaGxDbklPRGJF
-      M3I4bFJMY0ZZaVNGQXpscEF2ZDQ2aGZYbHVveHNNT0tzUzRKd1dtVU1qSEVJMzk1OTdBbEtkZUNt
-      SlF5OVhvL0lJTE94cWxQWVA5OTlETU5BRkJJdHlzcHZwakEzMlY1K0pBcVd1LzhwL08xeWZVb3dI
-      ellSNitpRkNPZ3p2R2dFVUZITGowbjNDaDlPd2tEeUtkUlMxVVJ1WnlEYnZmbEdNYzYwYWllbWEz
-      Smprd0l6U2diaHNtdzA0L3JpMzNZUHR1a3dTYkhUWEdzYm0zNFBzL1VUQXQzdDk1MG9CNWlxeHc9
-  true:
+    secure: yMCR3m2DdcLpVoZTH+/8fOZ/RiZ8zV8+PezH2cnUEJjH8GRrs7h0OjPYGFILgeeN1OoB6CxBaNpOLNfkeHlQ6AVtsNHJ2CdLB9RvL6+DsG6hVqOcL4drTZtQJRk2ZPtWr1hT6BNkrP8/pOu6war+MALJ+01n7Wj/Ot+m8Qp5TXT82man6bkUJMGKbiTHOh6I58R3sSjLcXiTL6kEifUenu5go1w9l5gX3NzaentHsB8mDdWi2EN4rALBkVub+cCLAowERxvG+kYgjPSTe3F2X2RI5DDO9/zCZiOOI7mgJQgx/NNNRdVre2RgjrDy6RxXuYME5pjfVRr8h7boBlwidpiY6oDGeZoDXr9S+41AgV5z3wKmf++Q6EpzgfDBgb1GD4kycXbkp10zhJu2fn8pSjQERG9ve9lqpoUzaS9NG3sX4r1UwiuBz8FPksRGxtD1xG0xjZnUumXfxfl+Ge5mEjRSZbLT76q7cearDnD9Qx2Z9DFrrjvt66jdmaOfxsbdzXMiLCLPy6Ht3luEhYbvhyKf1jlvd78qXypVnp0DPZhVcLaq1HW2wA4ZmS9g7ZnvxtCNfxwwbf1Uy7AGhuRBFS88mr1th7BJvd23aNdjPENOBMxeFInjzQ06E2vXRt3TzJVn1ViBhVGFyU1uh1x7apne7XmOPAPt4XKIFYMx9QA=
+  on:
     python: 2.7
-    repo: graphql-python/graphql_ws
+    repo: graphql-python/graphql-ws
     tags: true
 install: pip install -U tox-travis
 language: python
 python:
+- 3.8
+- 3.7
 - 3.6
 - 3.5
 - 2.7

CONTRIBUTING.rst

@@ -68,7 +68,7 @@ Ready to contribute? Here's how to set up `graphql_ws` for local development.
 
     $ mkvirtualenv graphql_ws
     $ cd graphql_ws/
-    $ python setup.py develop
+    $ pip install -e .[dev]
 
 4. Create a branch for local development::
 
@@ -79,11 +79,8 @@ Ready to contribute? Here's how to set up `graphql_ws` for local development.
 5. When you're done making changes, check that your changes pass flake8 and the tests, including testing other Python versions with tox::
 
     $ flake8 graphql_ws tests
-    $ python setup.py test or py.test
     $ tox
 
-   To get flake8 and tox, just pip install them into your virtualenv.
-
 6. Commit your changes and push your branch to GitHub::
 
     $ git add .
@@ -101,14 +98,6 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.rst.
-3. The pull request should work for Python 2.6, 2.7, 3.3, 3.4 and 3.5, and for PyPy. Check
+3. The pull request should work for Python 2.7, 3.5, 3.6, 3.7 and 3.8. Check
    https://travis-ci.org/graphql-python/graphql_ws/pull_requests
    and make sure that the tests pass for all supported Python versions.
-
-Tips
-----
-
-To run a subset of tests::
-
-$ py.test tests.test_graphql_ws
-

HISTORY.rst

@@ -2,7 +2,25 @@
 History
 =======
 
+0.3.0 (2018-09-25)
+==================
+
+- Django channels (v1) server (with example app).
+
+- Websockets lib server (with example app).
+
+- Observable aiter server.
+
+
+0.2.0 (2017-11-18)
+==================
+
+- Add gevent subscription server.
+
+- Add example flask gevent app.
+
+
 0.1.0 (2017-10-15)
-------------------
+==================
 
-* First release on PyPI.
+- First release on PyPI.

MANIFEST.in

@@ -3,12 +3,13 @@ include CONTRIBUTING.rst
 include HISTORY.rst
 include LICENSE
 include README.rst
+include tox.ini
 
 graft graphql_ws/django/templates
 graft examples
 prune examples/django_channels2/.cache
-recursive-include tests *
-recursive-exclude * __pycache__
-recursive-exclude * *.py[co]
+graft tests
+global-exclude __pycache__
+global-exclude *.py[co]
 
 recursive-include docs *.rst conf.py Makefile make.bat *.jpg *.png *.gif