|
 |
3adb01 |
From ce277612b1e262a84a1a97e5084571b66b7dd573 Mon Sep 17 00:00:00 2001
|
|
|
3adb01 |
From: Dan Callaghan <dcallagh@redhat.com>
|
|
|
3adb01 |
Date: Thu, 11 Feb 2016 10:29:02 +1000
|
|
|
3adb01 |
Subject: [PATCH] switch requirement from pykerberos back to kerberos
|
|
|
3adb01 |
|
|
|
3adb01 |
For now, Fedora still has the original "kerberos" module, not the newer
|
|
|
3adb01 |
fork "pykerberos". That will work fine too.
|
|
|
3adb01 |
---
|
|
|
3adb01 |
requirements.txt | 2 +-
|
|
|
3adb01 |
setup.py | 2 +-
|
|
|
3adb01 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
3adb01 |
|
|
|
3adb01 |
diff --git a/requirements.txt b/requirements.txt
|
|
|
3adb01 |
index c49add0..98fcbbc 100644
|
|
|
3adb01 |
--- a/requirements.txt
|
|
|
3adb01 |
+++ b/requirements.txt
|
|
|
3adb01 |
@@ -1,6 +1,6 @@
|
|
|
3adb01 |
requests>=1.1.0
|
|
|
3adb01 |
winkerberos >= 0.5.0; sys.platform == 'win32'
|
|
|
3adb01 |
-pykerberos >= 1.1.8, < 2.0.0; sys.platform != 'win32'
|
|
|
3adb01 |
+kerberos; sys.platform != 'win32'
|
|
|
3adb01 |
cryptography>=1.3
|
|
|
3adb01 |
cryptography>=1.3; python_version!="3.3"
|
|
|
3adb01 |
cryptography>=1.3, <2; python_version=="3.3"
|
|
|
3adb01 |
diff --git a/setup.py b/setup.py
|
|
|
3adb01 |
index 8381ac7..53dafc0 100755
|
|
|
3adb01 |
--- a/setup.py
|
|
|
3adb01 |
+++ b/setup.py
|
|
|
3adb01 |
@@ -54,7 +54,7 @@ def get_version():
|
|
|
3adb01 |
],
|
|
|
3adb01 |
extras_require={
|
|
|
3adb01 |
':sys_platform=="win32"': ['winkerberos>=0.5.0'],
|
|
|
3adb01 |
- ':sys_platform!="win32"': ['pykerberos>=1.1.8,<2.0.0'],
|
|
|
3adb01 |
+ ':sys_platform!="win32"': ['kerberos'],
|
|
|
3adb01 |
},
|
|
|
3adb01 |
test_suite='test_requests_kerberos',
|
|
|
3adb01 |
tests_require=['mock'],
|
|
|
3adb01 |
--
|
|
|
3adb01 |
2.13.6
|
|
|
3adb01 |
|