Merge pull request #364 from tofu-rocketry/363-simplify-reqs

363 simplify reqs
apel · Sep 11, 2024 · 64d017a · 64d017a
2 parents 0539eb6 + b9cbb33
commit 64d017a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -22,7 +22,7 @@ RUN yum -y install libffi-devel && yum clean all
 RUN yum -y install openssl && yum clean all
 
 # Install the python requirements of SSM
-RUN pip install -r requirements-docker.txt
+RUN pip install -r requirements.txt
 # Then install the SSM
 RUN python3 setup.py install
 

diff --git a/requirements-docker.txt b/requirements-docker.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,11 +1,10 @@
 # Base requirements for ssm
 
-argo-ams-library
-certifi<2020.4.5.2  # Used by AMS (via requests), 2020.4.5.2 dropped support for Python 2
-pyopenssl >=19.1.0, <=21.0.0  # 22.0.0 dropped support for Python 2
-cryptography==3.3.2  # Crypto dropped support for Python 2 after 3.3
-stomp.py<5.0.0
-python-daemon<=2.3.0  # 2.3.1 dropped support for Python 2
+argo-ams-library>=0.5.1  # 0.4.x series no longer works with SSM
+pyopenssl<23.3.0  # 23.3.0 dropped support for Python 3.6
+cryptography<41.0.0  # 41.0.0 dropped support for Python 3.6
+stomp.py<8.1.1  # 8.1.1 dropped suppot for Python 3.6
+python-daemon
 setuptools  # Required for pkg_resources
 
 # Dependencies for optional dirq based sending