Remove python27 from tox env.

Remove py27 pins
fix LFTOOLS_CONFIG_FILE to use os.path

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: Id237c116cecf80c7d827413ac3d63c58960f7b45

diff --git a/lftools/config.py b/lftools/config.py
index 4b969be..c30016c 100644 (file)
--- a/lftools/config.py
+++ b/lftools/config.py
@@ -13,12 +13,14 @@
 __author__ = 'Thanh Ha'
 
 import logging
+import os.path
 
 from six.moves import configparser
 from xdg import XDG_CONFIG_HOME
 
 log = logging.getLogger(__name__)
-LFTOOLS_CONFIG_FILE = '/'.join([XDG_CONFIG_HOME, 'lftools', 'lftools.ini'])
+
+LFTOOLS_CONFIG_FILE = os.path.join(XDG_CONFIG_HOME, 'lftools', 'lftools.ini')
 
 
 def get_config():

diff --git a/requirements-docs.txt b/requirements-docs.txt
index b0763bd..2ac7ac6 100644 (file)
--- a/requirements-docs.txt
+++ b/requirements-docs.txt
@@ -1,6 +1,4 @@
 -r requirements.txt
 lfdocs-conf
-reno~=2.11.2
+reno
 sphinxcontrib-programoutput
-# pytest 5 requires Python >= 3.5
-pytest~=4.6.4

diff --git a/requirements-test.txt b/requirements-test.txt
index 21f2437..ce94613 100644 (file)
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,11 +1,6 @@
 -r requirements.txt
-# pytest 5 requires Python >= 3.5
-pytest~=4.6.4
+pytest
 pytest-click
 pytest-datafiles
 pytest-mock
 pytest-responses
-
-# Pin transitive dependencies
-more-itertools~=5.0.0  # 6.0.0 requires Python 3.4
-

diff --git a/requirements.txt b/requirements.txt
index a843109..6495603 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,15 +2,14 @@ click
 docker
 glob2  # Needed for Python < 3.5 recursive glob support
 defusedxml # Needed due to tox complains on parseString not safe
-jsonschema~=2.6.0
-requests>=2.20.0
+jsonschema
+requests
 ruamel.yaml
 setuptools>=36.5.0
-six~=1.11.0
-python-jenkins~=1.1.0
+six
+python-jenkins
 tqdm
-xdg~=1.0.7;python_version<'3'
-xdg~=3.0.0;python_version>='3'
+xdg~=3.0.0;python_version>='3' # xdg requires Python '>=3.6,<4.0' but the running Python is 3.5.7
 pygithub
 httplib2
 email_validator
@@ -19,6 +18,3 @@ pyyaml
 pygerrit2
 bs4
 lxml
-
-# workarounds to prevent upstream from breaking us
-netifaces==0.10.5

diff --git a/tox.ini b/tox.ini
index 253a27f..0de3052 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,6 @@ envlist =
     docs-linkcheck,
     license,
     pre-commit,
-    py27,
     py35,
     py36,
     py37
@@ -21,8 +20,8 @@ basepython = python3
 deps =
     coala
     coala-bears
-    detox~=0.18
-    nodeenv==1.1.2
+    detox
+    nodeenv
     numpy
 commands =
     nodeenv -p