bump version; test pypi

pioreactor/version.py

@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = "21.5.1"
+__version__ = "21.11.0"

requirements/requirements.txt

@@ -3,6 +3,5 @@ paho-mqtt==1.6.1
 psutil==5.8.0
 sh==1.14.2
 JSON-log-formatter==0.4.0
-importlib_metadata
-requests
+requests==2.26.0
 rpi_hardware_pwm==0.1.3

requirements/requirements_leader.txt

@@ -1,4 +1,3 @@
--r requirements.txt
-paramiko
-https://github.com/pioreactor/sqlite3worker/archive/master.zip
-crudini
+paramiko==2.8.0
+sqlite3worker @ git+https://github.com/pioreactor/sqlite3worker.git
+crudini==0.9.3

requirements/requirements_worker.txt

@@ -1,9 +1,6 @@
--r requirements.txt
-RPi.GPIO
+RPi.GPIO==0.7.0
 adafruit-circuitpython-ads1x15===2.2.8
-https://github.com/pioreactor/simple-pid/archive/master.zip
+simple-pid @ git+https://github.com/pioreactor/simple-pid.git
 DAC43608==0.2.6
 TMP1075==0.2.0
 rpi-hardware-pwm==0.1.3
-
-# numpy as well, but that's installed elsewhere

setup.py

@@ -3,22 +3,53 @@
 
 exec(compile(open("pioreactor/version.py").read(), "pioreactor/version.py", "exec"))
 
-with open("requirements/requirements.txt") as f:
-    REQUIREMENTS = f.read().splitlines()
 
+CORE_REQUIREMENTS = [
+    "click>=8.0.0",
+    "paho-mqtt>=1.6.0",
+    "psutil>=5.8.0",
+    "sh>=1.14.0",
+    "JSON-log-formatter>=0.4.0",
+    "requests>=2.0.0",
+    "rpi_hardware_pwm>=0.1.3",
+]
+
+
+LEADER_REQUIREMENTS = [
+    "paramiko>=2.8.0",
+    "sqlite3worker @ git+https://github.com/pioreactor/sqlite3worker.git",
+    "crudini>=0.9.0",
+]
+
+
+WORKER_REQUIREMENTS = [
+    "RPi.GPIO>=0.7.0",
+    "adafruit-circuitpython-ads1x15>=2.2.8",
+    "simple-pid @ git+https://github.com/pioreactor/simple-pid.git",
+    "DAC43608>=0.2.6",
+    "TMP1075>=0.2.0",
+    "rpi-hardware-pwm>=0.1.3",
+]
 
 setup(
     name="pioreactor",
     version=__version__,  # type: ignore # noqa: F821g
     license="MIT",
     long_description=open("README.md").read(),
+    author="Pioreactor",
     author_email="[email protected]",
-    install_requires=REQUIREMENTS,
+    install_requires=CORE_REQUIREMENTS,
     include_package_data=True,
     packages=find_packages(exclude=["*.tests", "*.tests.*"]),
     entry_points="""
         [console_scripts]
         pio=pioreactor.cli.pio:pio
         pios=pioreactor.cli.pios:pios
     """,
+    python_requires=">=3.9",
+    extras_require={
+        "leader": LEADER_REQUIREMENTS,
+        "worker": WORKER_REQUIREMENTS,
+        "leader_worker": LEADER_REQUIREMENTS + WORKER_REQUIREMENTS,
+    },
 )