diff --git a/.gitea/workflows/package.yml b/.gitea/workflows/python-package.yml
similarity index 55%
rename from .gitea/workflows/package.yml
rename to .gitea/workflows/python-package.yml
index 47206aa..471efe9 100644
--- a/.gitea/workflows/package.yml
+++ b/.gitea/workflows/python-package.yml
@@ -1,11 +1,14 @@
-name: Python Package
+name: Test and Package Python
 on: [push]
 
 jobs:
+  Test:
+    uses: jmaa/workflows/.gitea/workflows/python-test.yaml@v6.21
   Package:
-    uses: jmaa/workflows/.gitea/workflows/python-package.yaml@v6.03
+    uses: jmaa/workflows/.gitea/workflows/python-package.yaml@v6.21
     with:
-      PUBLISH: true
+      REGISTRY_DOMAIN: gitfub.space
+      REGISTRY_ORGANIZATION: jmaa
     secrets:
       PIPY_REPO_USER: ${{ secrets.PIPY_REPO_USER }}
       PIPY_REPO_PASS: ${{ secrets.PIPY_REPO_PASS }}
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..a3e6e50
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,3 @@
+requests
+requests_ratelimiter
+requests_cache
diff --git a/requirements_test.txt b/requirements_test.txt
new file mode 100644
index 0000000..e079f8a
--- /dev/null
+++ b/requirements_test.txt
@@ -0,0 +1 @@
+pytest
diff --git a/setup.py b/setup.py
index f84c8de..1221351 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,11 @@
 #!/usr/bin/env python
+#
+# WARNING
+#
+# THIS IS AN AUTOGENERATED FILE.
+#
+# MANUAL CHANGES CAN AND WILL BE OVERWRITTEN.
+
 import re
 
 from setuptools import setup
@@ -15,9 +22,18 @@ with open(PACKAGE_NAME + '/_version.py') as f:
     del match, text
 
 
+def parse_requirements(text: str) -> list[str]:
+    return text.strip().split('\n')
+
+
+def read_requirements(path: str):
+    with open(path) as f:
+        return parse_requirements(f.read())
+
+
 def get_short_description(readme: str):
     readme = re.sub(r'#+[^\n]*\n+', '', readme)
-    m = re.search(r'^\s*(\w+[\w\s,`]+\.)', readme)
+    m = re.search(r'^\s*(\w+[\w\s,`-]+\.)', readme)
     try:
         return m.group(1)
     except AttributeError as err:
@@ -25,6 +41,17 @@ def get_short_description(readme: str):
         raise Exception(msg) from err
 
 
+REQUIREMENTS_MAIN = """
+requests
+requests_ratelimiter
+requests_cache
+"""
+
+REQUIREMENTS_TEST = """
+pytest
+"""
+
+
 setup(
     name=PACKAGE_NAME,
     version=version,
@@ -35,10 +62,9 @@ setup(
     author_email='jonjmaa@gmail.com',
     url='https://gitfub.space/Jmaa/' + PACKAGE_NAME,
     packages=[PACKAGE_NAME],
-    install_requires=['requests'],
+    install_requires=parse_requirements(REQUIREMENTS_MAIN),
     extras_require={
-        'Request ratelimiting': ['requests_ratelimiter'],
-        'Request caching': ['requests_cache'],
-        'test': ['pytest'],
+        'test': parse_requirements(REQUIREMENTS_TEST),
     },
+    python_requires='>=3.9',
 )