Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version fixes #204

Merged
merged 3 commits into from
Jul 28, 2022
Merged

Version fixes #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a1931a
Limit python-daemon version for Py 2 support
tofu-rocketry Jul 26, 2022
20a6f51
Update Python 3 Travis test version to avoid bug
tofu-rocketry Jul 26, 2022
e72883f
Add missing python-ldap version pinning
tofu-rocketry Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ os: linux
language: python
python:
- "2.7"
- "3.7"
- "3.8"

# Cache the dependencies installed by pip
cache: pip
Expand Down
2 changes: 1 addition & 1 deletion apel-ssm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ 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'],
'daemon': ['python-daemon'],
'daemon': ['python-daemon<=2.3.0'],
'dirq': ['dirq'],
},
packages=find_packages(exclude=['bin', 'test']),
Expand Down