From ccaa778a0062511b0b2b0a481593f73d4122a186 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Thu, 14 Oct 2021 15:20:53 -0400
Subject: [PATCH 1/2] add packaging

---
 pyproject.toml   |  3 +++
 requirements.txt | 13 -------------
 setup.cfg        | 38 ++++++++++++++++++++++++++++++++++++++
 setup.py         |  4 ++++
 4 files changed, 45 insertions(+), 13 deletions(-)
 create mode 100644 pyproject.toml
 delete mode 100644 requirements.txt
 create mode 100644 setup.cfg
 create mode 100644 setup.py

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..596d494
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools","wheel"]
+build-backend = 'setuptools.build_meta'
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index b8053bd..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-aiohttp==3.3.2
-async-timeout==3.0.0
-attrs==18.1.0
-chardet==3.0.4
-idna==2.7
-idna-ssl==1.1.0
-multidict==4.3.1
-pycryptodome==3.9.4
-PyYAML>=5.1
-simplejson==3.16.0
-yarl==1.2.6
-cachetools
-async_lru
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..ee4acad
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,38 @@
+[metadata]
+name = relay
+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
+url = https://git.pleroma.social/pleroma/relay
+license = AGPLv3
+license_file = LICENSE
+classifiers =
+    Environment :: Console
+    License :: OSI Approved :: AGPLv3 License
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+project_urls =
+    Source = https://git.pleroma.social/pleroma/relay
+    Tracker = https://git.pleroma.social/pleroma/relay/-/issues
+
+[options]
+zip_safe = False
+packages = find:
+install_requires =
+		aiohttp>=3.5.4
+		async-timeout>=3.0.0
+		attrs>=18.1.0
+		chardet>=3.0.4
+		idna>=2.7
+		idna-ssl>=1.1.0; python_version < "3.7"
+		multidict>=4.3.1
+		pycryptodome>=3.9.4
+		PyYAML>=5.1
+		simplejson>=3.16.0
+		yarl>=1.2.6
+		cachetools
+		async_lru
+python_requires = >=3.6
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..1abbd06
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,4 @@
+import setuptools
+
+if __name__ == "__main__":
+    setuptools.setup()

From f91afb14f7b48995e8d2faa64340c6ab71b9ed73 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Fri, 15 Oct 2021 20:28:19 -0400
Subject: [PATCH 2/2] update README with new install directions

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 788bfdc..da3fcfd 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ in this package as the `LICENSE` file.
 You need at least Python 3.6 (latest version of 3.x recommended) to make use of this software.
 It simply will not run on older Python versions.
 
-Install the dependencies as you normally would (`pip3 install -r requirements.txt`).
+Download the project and install with pip (`pip3 install .`).
 
 Copy `relay.yaml.example` to `relay.yaml` and edit it as appropriate: