Merge pull request #539 from offu/drop_py2

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

Author: whtsky

.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

.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

appveyor.yml

@@ -9,7 +9,7 @@ install:
   - C:\Python35\python -m pip install --force-reinstall tox
   - set PYTHONIOENCODING=utf-8
 test_script:
-  - C:\Python35\python -m tox -c tox-win.ini
+  - C:\Python35\python -m tox -c tox.ini
 on_success:
   - set PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%
   - pip install codecov coverage

docs/changelog.rst

@@ -1,6 +1,11 @@
 Changelog
 =============
 
+Version 1.11.0
+----------------
++ 停止了对 Python2 与 PyPy 的支持。 ( `#539 <https://github.com/offu/WeRoBot/pull/539>`_ )
++ 停止了对 SAE 相关代码的测试。 ( `#539 <https://github.com/offu/WeRoBot/pull/539>`_ )
+
 Version 1.10.1
 ----------------
 + 修复 :ref:`群发接口` 的 docstring 样式。

docs/deploy.rst

@@ -130,8 +130,9 @@ server 支持以下几种：
 在SAE上部署
 -----------------
 
+.. attention:: 从 :ref:`Version 1.11.0` 开始，WeRoBot 停止测试 SAE 相关部分的代码。
 
-    新浪云上的 Python 应用的入口为 index.wsgi:application ，也就是 index.wsgi 这个文件中名为 application 的 callable object。
+新浪云上的 Python 应用的入口为 index.wsgi:application ，也就是 index.wsgi 这个文件中名为 application 的 callable object。
 
 
 所以，假设你在 `robot.py` 中使用了 WeRoBot ::

requirements.txt

@@ -1,4 +1,3 @@
 bottle
 requests
-six
-xmltodict
+xmltodict

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',