refac: Move to src/ layout

deepbrook · Feb 14, 2022 · 09be0ed · 09be0ed
1 parent 07ce824
commit 09be0ed
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 32 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -21,33 +21,38 @@ This module depends on websocket-client module available from: <http://github.co
 Example of using this pusher client to consume websockets:
 
 ```python
+
 import pysher
 
 # Add a logging handler so we can see the raw communication data
 import logging
+
 root = logging.getLogger()
 root.setLevel(logging.INFO)
 ch = logging.StreamHandler(sys.stdout)
 root.addHandler(ch)
 
 pusher = pysher.Pusher(appkey)
 
-def  my_func(*args, **kwargs):
-    print("processing Args:", args)
-    print("processing Kwargs:", kwargs)
+
+def my_func(*args, **kwargs):
+ print("processing Args:", args)
+ print("processing Kwargs:", kwargs)
+
 
 # We can't subscribe until we've connected, so we use a callback handler
 # to subscribe when able
 def connect_handler(data):
-    channel = pusher.subscribe('mychannel')
-    channel.bind('myevent', my_func)
+ channel = pusher.subscribe('mychannel')
+ channel.bind('myevent', my_func)
+
 
 pusher.connection.bind('pusher:connection_established', connect_handler)
 pusher.connect()
 
 while True:
-    # Do other things in the meantime here...
-    time.sleep(1)
+ # Do other things in the meantime here...
+ time.sleep(1)
 ```
 
 Sending pusher events to a channel can be done simply using the pusher client supplied by pusher.  You can get it here: <https://github.com/pusher/pusher-http-python>

diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -1,8 +1,8 @@
+#!/usr/bin/env python
+from setuptools import find_packages
 from setuptools import setup
 
-VERSION = "1.0.6"
-
-requirements = ["websocket-client!=0.49"]
+VERSION = "1.0.7"
 
 
 def readme():
@@ -19,9 +19,13 @@ def readme():
     author="Nils Diefenbach",
     author_email="[email protected]",
     license="MIT",
-    url="https://github.com/nlsdfnbch/Pysher",
-    install_requires=requirements,
-    packages=["pysher"],
+    url="https://github.com/deepbrook/Pysher",
+    packages=find_packages('src'),
+    package_dir={'': 'src'},
+    install_requires=[
+        "websocket-client!=0.49",
+    ],
+    tests_requires=["autobahn"],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Environment :: Web Environment',

diff --git a/pysher/__init__.py → src/pysher/__init__.py b/pysher/__init__.py → src/pysher/__init__.py
@@ -1,5 +1,4 @@
-from pysher.pusher import Pusher
 from pysher.connection import Connection
-from pysher.channel import Channel
-
+from pysher.pusher import Pusher
 
+__all__ = ["Connection", "Pusher"]
diff --git a/pysher/channel.py → src/pysher/channel.py b/pysher/channel.py → src/pysher/channel.py
diff --git a/pysher/connection.py → src/pysher/connection.py b/pysher/connection.py → src/pysher/connection.py
diff --git a/pysher/pusher.py → src/pysher/pusher.py b/pysher/pusher.py → src/pysher/pusher.py
@@ -5,7 +5,7 @@
 import logging
 import json
 
-VERSION = '0.6.0'
+VERSION = '1.0.7'
 
 
 class Pusher(object):

diff --git a/tests/test_pusherclient.py b/tests/test_pusherclient.py
@@ -30,7 +30,7 @@
 global exit_code
 
 
-def test_channel_callback(data):
+def channel_callback_test(data):
     global exit_code
     print("Client: %s" % data)
 
@@ -46,7 +46,7 @@ def test_channel_callback(data):
 
 def connect_handler(data):
     channel = client.subscribe("test_channel")
-    channel.bind('test_event', test_channel_callback)
+    channel.bind('test_event', channel_callback_test)
 
 
 def stop_test():