PHOENIX-7221 Manage requests-gssapi version for Phython 3.7 and lower
diff --git a/python-phoenixdb/README.rst b/python-phoenixdb/README.rst
index 0c609a8..a8aa96c 100644
--- a/python-phoenixdb/README.rst
+++ b/python-phoenixdb/README.rst
@@ -26,10 +26,17 @@
Extract the archive and then install it manually::
- cd /path/to/phoenix-queryserver-x.y.z/python/phoenixdb
+ cd /path/to/phoenix-queryserver-x.y.z/python-phoenixdb
pip install -r requirements.txt
python setup.py install
+Note that old versions of pip and setuptools have various bugs and incompatibilities that
+may result in installation errors, especially on old python versions.
+If you encounter problems while building, update your pip and setuptools, and try again::
+ pip install --upgrade pip
+ pip install --upgrade setuptools
+
+
Usage
-----
@@ -83,7 +90,7 @@
use to set up the environment for the tests.
Note: Depending on the Phoenix version used for building, you may or may not need the
-`-Pshade-javax-servlet` option. Check BUILDING.md in the repository root.
+`-Pshade-javax-servlet` option. See BUILDING.md in the repository root for more information.
If you want to use the library without installing the phoenixdb library, you can use
the `PYTHONPATH` environment variable to point to the library directly::
diff --git a/python-phoenixdb/setup.py b/python-phoenixdb/setup.py
index c3acca5..36a33f5 100644
--- a/python-phoenixdb/setup.py
+++ b/python-phoenixdb/setup.py
@@ -40,8 +40,11 @@
install_requires=[
'protobuf>=3.0.0',
'requests',
- 'requests-gssapi',
]
+ if sys.version_info < (3,8):
+ install_requires.append('requests-gssapi<1.3.0')
+ else:
+ install_requires.append('requests-gssapi')
if sys.version_info < (3,6):
install_requires.append('gssapi<1.6.0')
#Don't build the docs on an old stack
@@ -50,8 +53,9 @@
install_requires=[
'protobuf>=3.0.0',
'requests',
- 'requests-gssapi',
- 'gssapi<1.6.0;python_version<"3.6"',
+ 'requests-gssapi; python_version>="3.8.0"',
+ 'requests-gssapi<1.3.0; python_version<"3.8.0"',
+ 'gssapi<1.6.0; python_version<"3.6.0"',
]
setup_requires=[
'Sphinx;python_version>="3.6"',
