Skip to content

Commit 1754166

Browse files
committed
Add setuptools as explicit dependency
We use pkg_resources with is distributed with setuptools. Even though setuptools is a dependency of python-ldap, so it would get installed during dependency resolution, it's best to be explicit.
1 parent 5d3be5b commit 1754166

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

apel-ssm.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ BuildArch: noarch
2121
BuildRequires: python-devel
2222
%endif
2323

24-
Requires: stomppy < 5.0.0, python-ldap < 3.4.0, openssl
24+
Requires: stomppy < 5.0.0, python-ldap < 3.4.0, python-setuptools, openssl
2525
Requires(pre): shadow-utils
2626

2727
%define ssmconf %_sysconfdir/apel

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
stomp.py<5.0.0
44
python-daemon<=2.3.0 # 2.3.1 dropped support for Python 2
55
python-ldap<3.4.0 # python-ldap-3.4.0 dropped support for Python 2
6+
setuptools # Required for pkg_resources (also happens to be a dependency of python-ldap)
7+
68
# Dependencies for optional dirq based sending
79
dirq
810

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def main():
5151
download_url='https://github.com/apel/ssm/releases',
5252
license='Apache License, Version 2.0',
5353
install_requires=[
54-
'stomp.py<5.0.0', 'python-ldap<3.4.0',
54+
'stomp.py<5.0.0', 'python-ldap<3.4.0', 'setuptools',
5555
],
5656
extras_require={
5757
'AMS': ['argo-ams-library'],

0 commit comments

Comments
 (0)