Merge remote-tracking branch 'origin/master' into development

Author: Pithikos

.circleci/config.yml

@@ -6,9 +6,13 @@ orbs:
 jobs:
   test:
     docker:
-      - image: circleci/python:3
+      - image: circleci/python:3.7
     steps:
       - checkout
+      - run:
+          name: install dependencies
+          command: |
+            pip install -r requirements.txt
       - run:
           name: run tests
           command: |
@@ -45,6 +49,7 @@ jobs:
           command: |
             tag=`git tag --points-at HEAD`
             if [ $tag ]; then
+              echo Uploading
               python -m twine upload dist/*
             fi
 

README.md

@@ -5,7 +5,7 @@ Websocket Server
 
 A minimal Websockets Server in Python with no external dependencies.
 
-  * Python3.5+
+  * Python3.6+
   * Clean simple API
   * Multiple clients
   * No dependencies
@@ -39,7 +39,7 @@ Testing
 
 Run all tests
 
-    tox
+    pytest
 
 
 API

docs/release-workflow.md

@@ -12,3 +12,5 @@ General flow
   4. Merge development into master (`git merge --no-ff development`)
   4. Add corresponding version as a new tag (`git tag <new_version>`) e.g. git tag v0.3.0
   5. Push everything (`git push --tags && git push`)
+
+-

releases.txt

@@ -11,3 +11,6 @@
 0.5.5
 - Allow running run_forever threaded
 - Fix shutting down of a server without connected clients
+
+0.5.6
+- Support from Python3.6+

requirements.txt

@@ -1,5 +1,4 @@
 # Dev/test/deploy
-tox>=3.24.0
 IPython
 pytest
 websocket-client>=1.1.1

setup.py

@@ -12,7 +12,7 @@
     from distutils.command.install import install
 
 
-VERSION = '0.5.5'
+VERSION = '0.5.6'
 
 
 def get_tag_version():
@@ -53,4 +53,5 @@ def run(self):
     cmdclass={
         'verify': VerifyVersionCommand,
     },
+    python_requires=">=3.6",
 )

tests/_bootstrap_.py

@@ -2,5 +2,5 @@
 import sys, os
 if os.getcwd().endswith('tests'):
 	sys.path.insert(0, '..')
-elif os.getcwd().endswith('websocket-server'):
+elif os.path.exists('websocket_server'):
 	sys.path.insert(0, '.')