refactor: drop support for Python 2, drop requirement for six package

offu · Feb 23, 2020 · ffed35d · ffed35d
1 parent 184286b
commit ffed35d
Show file tree

Hide file tree

Showing 22 changed files with 134 additions and 788 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,22 +1,5 @@
 version: 2
 jobs:
-  python2.7:
-    docker:
-      - image: python:2
-    working_directory: ~/werobot
-    steps:
-      - checkout
-      - run: cat requirements.txt dev-requirements.txt tox-requirements.txt > dependency.txt
-      - restore_cache:
-          key: v1-python2-{{ checksum "dependency.txt" }}
-      - run:
-          command: |
-            cat dev-requirements.txt | grep tox== | xargs pip install codecov
-            tox -l | grep py2 | tr '\n' ',' | xargs tox -e && codecov
-      - save_cache:
-          key: v1-python2-{{ checksum "dependency.txt" }}
-          paths:
-            - .tox
   python3.5:
     docker:
       - image: python:3.5
@@ -85,23 +68,6 @@ jobs:
           key: v1-python3.8-{{ checksum "dependency.txt" }}
           paths:
             - .tox
-  pypy:
-    docker:
-      - image: pypy:2
-    working_directory: ~/werobot
-    steps:
-      - checkout
-      - run: cat requirements.txt dev-requirements.txt tox-requirements.txt > dependency.txt
-      - restore_cache:
-          key: v1-pypy-{{ checksum "dependency.txt" }}
-      - run:
-          command: |
-            cat dev-requirements.txt | grep tox== | xargs pip install codecov
-            tox -l | grep pypy | tr '\n' ',' | xargs tox -e && codecov
-      - save_cache:
-          key: v1-pypy-{{ checksum "dependency.txt" }}
-          paths:
-            - .tox
   docs:
     docker:
       - image: python:3.7
@@ -133,11 +99,9 @@ workflows:
   version: 2
   test:
     jobs:
-      - python2.7
       - python3.5
       - python3.6
       - python3.7
       - python3.8
-      - pypy
       - docs
       - lint
diff --git a/.travis.yml b/.travis.yml
@@ -9,12 +9,6 @@ matrix:
     - env:
         - PYTHON_MAJOR="py36|py37"
         - PYTHON_VERSION="3.6.5 3.7.0"
-    - env:
-        - PYTHON_MAJOR=py2
-        - PYTHON_VERSION="2.7.14"
-    - env:
-        - PYTHON_MAJOR=pypy
-        - PYTHON_VERSION="pypy2.7-7.2.0"
 cache:
   directories:
     - $HOME/.pyenv

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,6 +3,6 @@
     "python.formatting.provider": "yapf",
     "python.linting.pylintEnabled": false,
     "python.testing.pytestEnabled": true,
-    "python.pythonPath": "venv/bin/python3",
+    "python.pythonPath": "venv\\Scripts\\python.exe",
     "restructuredtext.confPath": "${workspaceFolder}/docs"
 }
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
 bottle
 requests
-six
-xmltodict
+xmltodict
diff --git a/setup.py b/setup.py
@@ -50,13 +50,12 @@ def run_tests(self):
         'Operating System :: POSIX',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
-        'Programming Language :: Python :: Implementation :: PyPy',
         'Intended Audience :: Developers',
         'Topic :: Software Development :: Libraries',
         'Topic :: Software Development :: Libraries :: Python Modules',