From 6a1931ab6810db020184df075723a3fe4a8ad2d7 Mon Sep 17 00:00:00 2001
From: Adrian Coveney <adrian.coveney@stfc.ac.uk>
Date: Tue, 26 Jul 2022 14:23:46 +0100
Subject: [PATCH 1/3] Limit python-daemon version for Py 2 support

---
 requirements.txt | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 95499af9..010564e1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # Base requirements for ssm
 
 stomp.py<5.0.0
-python-daemon
+python-daemon<=2.3.0  # 2.3.1 dropped support for Python 2
 python-ldap<3.4.0  # python-ldap-3.4.0 dropped support for Python 2
 # Dependencies for optional dirq based sending
 dirq
diff --git a/setup.py b/setup.py
index fb3d2ca9..d7505cd5 100644
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@ def main():
           ],
           extras_require={
               'AMS': ['argo-ams-library'],
-              'daemon': ['python-daemon'],
+              'daemon': ['python-daemon<=2.3.0'],
               'dirq': ['dirq'],
           },
           packages=find_packages(exclude=['bin', 'test']),

From 20a6f5141bddfde348317defa22e86a21e7a6b25 Mon Sep 17 00:00:00 2001
From: Adrian Coveney <adrian.coveney@stfc.ac.uk>
Date: Tue, 26 Jul 2022 15:00:00 +0100
Subject: [PATCH 2/3] Update Python 3 Travis test version to avoid bug

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e9a47df4..70e2d56c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ os: linux
 language: python
 python:
   - "2.7"
-  - "3.7"
+  - "3.8"
 
 # Cache the dependencies installed by pip
 cache: pip

From e72883f9644fcc829f5c336d5c113a0e6fbe132b Mon Sep 17 00:00:00 2001
From: Adrian Coveney <adrian.coveney@stfc.ac.uk>
Date: Tue, 26 Jul 2022 15:13:21 +0100
Subject: [PATCH 3/3] Add missing python-ldap version pinning

---
 apel-ssm.spec | 2 +-
 setup.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apel-ssm.spec b/apel-ssm.spec
index c7d54cd2..449e5776 100644
--- a/apel-ssm.spec
+++ b/apel-ssm.spec
@@ -21,7 +21,7 @@ BuildArch:      noarch
 BuildRequires:  python-devel
 %endif
 
-Requires:       stomppy < 5.0.0, python-ldap, openssl
+Requires:       stomppy < 5.0.0, python-ldap < 3.4.0, openssl
 Requires(pre):  shadow-utils
 
 %define ssmconf %_sysconfdir/apel
diff --git a/setup.py b/setup.py
index d7505cd5..57ff1fc2 100644
--- a/setup.py
+++ b/setup.py
@@ -51,7 +51,7 @@ def main():
           download_url='https://github.com/apel/ssm/releases',
           license='Apache License, Version 2.0',
           install_requires=[
-              'stomp.py<5.0.0', 'python-ldap',
+              'stomp.py<5.0.0', 'python-ldap<3.4.0',
           ],
           extras_require={
               'AMS': ['argo-ams-library'],