replace aputils git url with tar.gz

* move deps to requirements.txt
* reference deps from requirements.txt in setup.cfg
* bump minimum python version to 3.7
* set version in setup.cfg from attribute

docs/installation.md

@@ -15,7 +15,7 @@ the [official pipx docs](https://pypa.github.io/pipx/installation/) for more in-
 
 Now simply install ActivityRelay directly from git
 
-	pipx install git+https://git.pleroma.social/pleroma/relay@0.2.3
+	pipx install git+https://git.pleroma.social/pleroma/relay@0.2.4
 
 Or from a cloned git repo.
 
@@ -39,7 +39,7 @@ be installed via [pyenv](https://github.com/pyenv/pyenv).
 The instructions for installation via pip are very similar to pipx. Installation can be done from
 git
 
-	python3 -m pip install git+https://git.pleroma.social/pleroma/relay@0.2.3
+	python3 -m pip install git+https://git.pleroma.social/pleroma/relay@0.2.4
 
 or a cloned git repo.
 

relay/__init__.py

@@ -1,3 +1,3 @@
-__version__ = '0.2.3'
+__version__ = '0.2.4'
 
 from . import logger

relay/application.py

@@ -4,6 +4,7 @@ import os
 import queue
 import signal
 import threading
+import traceback
 
 from aiohttp import web
 from datetime import datetime, timedelta
@@ -175,6 +176,10 @@ class PushWorker(threading.Thread):
 			except queue.Empty:
 				pass
 
+			## make sure an exception doesn't bring down the worker
+			except Exception:
+				traceback.print_exc()
+
 		await self.client.close()
 
 

relay/config.py

@@ -98,12 +98,6 @@ class RelayConfig(DotDict):
 			'whitelist': []
 		})
 
-		if self.is_docker:
-			self.update({
-				'db': Path('/data/relay.jsonld'),
-				'listen': '127.0.0.1'
-			})
-
 
 	def ban_instance(self, instance):
 		if instance.startswith('http'):

requirements.txt

@@ -1 +1,5 @@
-.
+aiohttp>=3.8.0
+aputils@https://git.barkshark.xyz/barkshark/aputils/archive/0.1.3.tar.gz
+cachetools>=5.2.0
+click>=8.1.2
+pyyaml>=6.0

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = relay
-version = 0.2.3
+version = attr: relay.__version__
 description = Generic LitePub relay (works with all LitePub consumers and Mastodon)
 long_description = file: README.md
 long_description_content_type = text/markdown; charset=UTF-8
@@ -22,14 +22,8 @@ project_urls =
 [options]
 zip_safe = False
 packages = find:
-install_requires =
+install_requires = file: requirements.txt
-    aiohttp >= 3.8.0
+python_requires = >=3.7
-    cachetools >= 5.0.0
-    click >= 8.1.2
-    pycryptodome >= 3.14.1
-    PyYAML >= 5.0.0
-    aputils @ git+https://git.barkshark.xyz/barkshark/aputils@2cd1776f12
-python_requires = >=3.6
 
 [options.extras_require]
 dev =