Attempt to fix broken PySocks Debian package dependency

README.md

@@ -13,7 +13,19 @@ A TORch solution consists of 3 processes:
 * MQTT broker - Any MQTT broker, reachable via IPv4 or Tor, through TLS or insecure communications
 * `torch-subscriber` - Listens for and handles onion hostname publications
 
-## Build Debian Package
+## Installation
+
+### Install Package from Rudefox Debian Repo
+
+1. Add the [Rudefox Repo](https://rudefox.io/repo/) as an `apt` source
+
+2. Install the `torch-agent` package
+
+```bash
+sudo apt install torch-agent
+```
+
+### Build Debian Package from Source
 
 If you don't already have a GPG key, generate one:
 
@@ -25,7 +37,7 @@ Using the e-mail address you provided during GPG key generation, run `build-deb.
 
 ```bash
 ./build-deb.sh john@doe.com
-apt update && apt install build/torch-agent_0.0.4-1_all.deb
+apt update && apt install build/torch-agent_0.0.5-1_all.deb
 ```
 
 This will:
@@ -44,4 +56,4 @@ The configuation directory can be specified by
 
 A fully configured example can be found [here](example)
 
-See the sample [`torch.conf`](torch.conf) file for additional configuration options and details
+See the sample [`torch.conf`](torch.conf) file for additional configuration options and details

debian/changelog

@@ -1,4 +1,4 @@
-torch-agent (0.0.4-1) stable; urgency=medium
+torch-agent (0.0.5-1) stable; urgency=medium
 
   * Update
 

example/README.md

@@ -35,19 +35,10 @@ In a separate terminal window, run the subscriber:
 
 #### Run TORch Agent in Vagrant
 
-[Build](..) the latest source into a Debian package and copy it to `example/`
-
-```bash
-cd ..
-./make-pkg.sh john@doe.com
-cp -f build/torch-agent_0.0.4-1_all.deb example/
-cd example
-```
-
 Run the Vagrant box in a third terminal window:
 
 ```bash
 vagrant up
 ```
 
-You should see that the broker received a connection from the Vagrant box at boot up and the subscriber received the onion hostname.  You can use a local `tor` proxy to connect to the vagrant box using SSH and the onion hostname.
+You should see that the broker received a connection from the Vagrant box at boot up and the subscriber received the onion hostname.  You can use a local `tor` proxy to connect to the vagrant box using SSH and the onion hostname.

requirements.txt

@@ -3,3 +3,4 @@ setuptools~=50.3.2
 stdeb3~=0.9.0.post2
 paho-mqtt~=1.5.1
 stem>=1.8.0
+PySocks

setup.cfg

@@ -16,6 +16,7 @@ install_requires =
     setuptools~=50.3.1
     pip~=20.2.3
     stem
+    PySocks
 
 [options.entry_points]
 console_scripts = torch-agent=torch_agent.torch_agent:main

torch_agent/__init__.py

@@ -1 +1 @@
-__version__ = "0.0.4"
+__version__ = "0.0.5"

torch_agent/torch_agent.py

@@ -1,7 +1,7 @@
 from stem.control import Controller
 import stem.connection
 import paho.mqtt.client as mqtt
-from paho.mqtt.client import socks
+import socks
 import ssl
 import socket
 import json