Python 2.7 dedicated branch

Python 3 will be supported in master

Signed-off-by: Alexey Stepanov <[email protected]>

Author: penguinolog

.travis.yml

@@ -3,61 +3,32 @@ language: python
 os: linux
 install:
 - &upgrade_python_toolset pip install --upgrade pip setuptools wheel
-- &install_test_deps pip install --upgrade pytest pytest-sugar
+- pip install --upgrade pytest pytest-sugar
 - &install_deps pip install -r CI_REQUIREMENTS.txt
 - pip install --upgrade pytest-cov coveralls
 
 _python:
 - &python27
   name: "Python 2.7"
   python: 2.7
-- &python34
-  name: "Python 3.4"
-  python: 3.4
-- &python35
-  name: "Python 3.5"
-  python: 3.5
 - &python36
   name: "Python 3.6"
   python: 3.6
-- &python37
-  name: "Python 3.7"
-  python: 3.7
-  dist: xenial
-  sudo: true
 - &pypy
   name: "PyPy"
   python: pypy
-- &pypy3
-  name: "PyPy3"
-  python: pypy3.5
 
 _helpers:
-- &install_cython pip install --upgrade Cython
 - &build_package python setup.py bdist_wheel
-- &install_built pip install advanced_descriptors --no-index -f dist
-- &test_no_cov  py.test -vv test
-- &test_cythonized
-  stage: Test cythonized
-  install:
-  - *upgrade_python_toolset
-  - *install_test_deps
-  - *install_deps
-  - *install_cython
-  script:
-  - *build_package
-  - *install_built
-  - *test_no_cov
-  after_success: skip
 
 - &static_analysis
   stage: Static analysis
-  <<: *python37
+  <<: *python36
   after_success: skip
 
 - &code_style_check
   stage: Code style check
-  <<: *python37
+  <<: *python36
   after_success: skip
 
 script:
@@ -72,21 +43,10 @@ jobs:
   include:
   - stage: test
     <<: *python27
-  - stage: test
-    <<: *python34
-  - stage: test
-    <<: *python35
-  - stage: test
-    <<: *python36
-  - stage: test
-    <<: *python37
   - stage: test
     <<: *pypy
-  - stage: test
-    <<: *pypy3
 
   - <<: *static_analysis
-    <<: *python36
     name: "PyLint"
     install:
     - *upgrade_python_toolset
@@ -106,19 +66,10 @@ jobs:
     install:
     - *upgrade_python_toolset
     - *install_deps
-    - pip install --upgrade "mypy >= 0.620"
+    - pip install --upgrade "mypy >= 0.630"
     script:
     - mypy --strict advanced_descriptors
 
-  - <<: *test_cythonized
-    <<: *python34
-  - <<: *test_cythonized
-    <<: *python35
-  - <<: *test_cythonized
-    <<: *python36
-  - <<: *test_cythonized
-    <<: *python37
-
   - <<: *code_style_check
     name: "PEP8"
     install:
@@ -137,18 +88,15 @@ jobs:
   - stage: deploy
     # This prevents job from appearing in test plan unless commit is tagged:
     if: tag IS present
-    # Run on pypy to build not cythonized wheel
-    <<: *pypy3
-    name: Build universal and cythonized bdist_wheel. Deploy bdist and sdist.
-    services:
-    - docker
+    <<: *pypy
+    name: Build universal bdist_wheel. Deploy bdist and sdist.
+    services: []
     install:
     - *upgrade_python_toolset
-    script:
-    - ./tools/run_docker.sh "Advanced_Descriptors"
-    before_deploy:
     - pip install -r build_requirements.txt
+    script:
     - *build_package
+    before_deploy: []
     deploy:
     - provider: pypi
       # `skip_cleanup: true` is required to preserve binary wheels, built

advanced_descriptors/separate_class_method.py

@@ -116,7 +116,7 @@ def __get__(self, instance, owner):  # type: (typing.Optional[typing.Any], typin
                 raise AttributeError()
 
             @six.wraps(self.__class_method)
-            def class_method(*args, **kwargs):  # type: (typing.Tuple, typing.Dict) -> typing.Any
+            def class_method(*args, **kwargs):  # type: (typing.Any, typing.Any) -> typing.Any
                 """Bound class method."""
                 return self.__class_method(owner, *args, **kwargs)  # type: ignore
 

setup.py

@@ -17,21 +17,10 @@
 
 import ast
 import collections
-from distutils.command import build_ext
-import distutils.errors
 import os.path
-import shutil
-import sys
-
-try:
-    from Cython.Build import cythonize
-except ImportError:
-    cythonize = None
 
 import setuptools
 
-PY3 = sys.version_info[:2] > (2, 7)
-
 with open(os.path.join(os.path.dirname(__file__), "advanced_descriptors", "__init__.py")) as f:
     source = f.read()
 
@@ -42,76 +31,12 @@
     long_description = f.read()
 
 
-def _extension(modpath):
-    """Make setuptools.Extension."""
-    return setuptools.Extension(modpath, [modpath.replace(".", "/") + ".py"])
-
-
-requires_optimization = [
-    _extension("advanced_descriptors.separate_class_method"),
-    _extension("advanced_descriptors.advanced_property"),
-]
-
-if "win32" != sys.platform:
-    requires_optimization.append(_extension("advanced_descriptors.__init__"))
-
-ext_modules = (
-    cythonize(
-        requires_optimization,
-        compiler_directives=dict(
-            always_allow_keywords=True, binding=True, embedsignature=True, overflowcheck=True, language_level=3
-        ),
-    )
-    if cythonize is not None and PY3
-    else []
-)
-
-
 class BuildFailed(Exception):
     """For install clear scripts."""
 
     pass
 
 
-class AllowFailRepair(build_ext.build_ext):
-    """This class allows C extension building to fail and repairs init."""
-
-    def run(self):
-        """Run."""
-        try:
-            build_ext.build_ext.run(self)
-
-            # Copy __init__.py back to repair package.
-            build_dir = os.path.abspath(self.build_lib)
-            root_dir = os.path.abspath(os.path.join(__file__, ".."))
-            target_dir = build_dir if not self.inplace else root_dir
-
-            src_file = os.path.join("advanced_descriptors", "__init__.py")
-
-            src = os.path.join(root_dir, src_file)
-            dst = os.path.join(target_dir, src_file)
-
-            if src != dst:
-                shutil.copyfile(src, dst)
-        except (
-            distutils.errors.DistutilsPlatformError,
-            getattr(globals()["__builtins__"], "FileNotFoundError", OSError),
-        ):
-            raise BuildFailed()
-
-    def build_extension(self, ext):
-        """build_extension."""
-        try:
-            build_ext.build_ext.build_extension(self, ext)
-        except (
-            distutils.errors.CCompilerError,
-            distutils.errors.DistutilsExecError,
-            distutils.errors.DistutilsPlatformError,
-            ValueError,
-        ):
-            raise BuildFailed()
-
-
 # noinspection PyUnresolvedReferences
 def get_simple_vars_from_src(src):
     """Get simple (string/number/boolean and None) assigned values from source.
@@ -160,8 +85,6 @@ def get_simple_vars_from_src(src):
     OrderedDict([('e', 1), ('f', 1), ('g', 1)])
     """
     ast_data = (ast.Str, ast.Num, ast.List, ast.Set, ast.Dict, ast.Tuple)
-    if PY3:
-        ast_data += (ast.Bytes, ast.NameConstant)
 
     tree = ast.parse(src)
 
@@ -196,18 +119,13 @@ def get_simple_vars_from_src(src):
     "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python :: 2",
     "Programming Language :: Python :: 2.7",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.4",
-    "Programming Language :: Python :: 3.5",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 
 keywords = ["descriptor", "property", "classmethod", "development"]
 
-setup_args = dict(
+setuptools.setup(
     name="Advanced-Descriptors",
     author=variables["__author__"],
     author_email=variables["__author_email__"],
@@ -221,7 +139,7 @@ def get_simple_vars_from_src(src):
     long_description=long_description,
     classifiers=classifiers,
     keywords=keywords,
-    python_requires=">=2.7.5,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*",
+    python_requires=">=2.7.5,<3.0",
     # While setuptools cannot deal with pre-installed incompatible versions,
     # setting a lower bound is not harmful - it makes error messages cleaner. DO
     # NOT set an upper bound on setuptools, as that will lead to uninstallable
@@ -234,14 +152,3 @@ def get_simple_vars_from_src(src):
     install_requires=required,
     package_data={"advanced_descriptors": ["py.typed"]},
 )
-if cythonize is not None:
-    setup_args["ext_modules"] = ext_modules
-    setup_args["cmdclass"] = dict(build_ext=AllowFailRepair)
-
-try:
-    setuptools.setup(**setup_args)
-except BuildFailed:
-    print("*" * 80 + "\n" "* Build Failed!\n" "* Use clear scripts version.\n" "*" * 80 + "\n")
-    del setup_args["ext_modules"]
-    del setup_args["cmdclass"]
-    setuptools.setup(**setup_args)

tox.ini

@@ -5,7 +5,7 @@
 
 [tox]
 minversion = 2.0
-envlist = black, pep8, pylint, mypy, bandit, pep257, py{27,34,35,36,37,py,py3}, py{34,35,36,37}-nocov, docs,
+envlist = black, pep8, pylint, mypy, bandit, pep257, py{27,py}, docs,
 skipsdist = True
 skip_missing_interpreters = True
 
@@ -20,53 +20,19 @@ deps =
     pytest-cov
     pytest-html
     pytest-sugar
-    py{34,35,36,37}-nocov: Cython
     -r{toxinidir}/CI_REQUIREMENTS.txt
     py{27,py}: mock
 
 commands =
     py.test -vv --junitxml=unit_result.xml --html=report.html --self-contained-html --cov-config .coveragerc --cov-report html --cov=advanced_descriptors {posargs:test}
     coverage report --fail-under 89
 
-[testenv:py34-nocov]
-usedevelop = False
-commands =
-    python setup.py bdist_wheel
-    pip install advanced_descriptors --no-index -f dist
-    py.test -vv {posargs:test}
-
-[testenv:py35-nocov]
-usedevelop = False
-commands =
-    python setup.py bdist_wheel
-    pip install advanced_descriptors --no-index -f dist
-    py.test -vv {posargs:test}
-
-[testenv:py36-nocov]
-usedevelop = False
-commands =
-    python setup.py bdist_wheel
-    pip install advanced_descriptors --no-index -f dist
-    py.test -vv {posargs:test}
-
-[testenv:py37-nocov]
-usedevelop = False
-commands =
-    python setup.py bdist_wheel
-    pip install advanced_descriptors --no-index -f dist
-    py.test -vv {posargs:test}
-
 [testenv:venv]
 commands = {posargs:}
 
 [tox:travis]
 2.7 = install, py27
-3.4 = py34,
-3.5 = py35,
-3.6 = py36,
-3.7 = py37,
 pypy = install, pypy,
-pypy3 = install, pypy3,
 
 [testenv:pep8]
 deps =
@@ -86,6 +52,7 @@ usedevelop = False
 commands = pip install ./ -vvv -U
 
 [testenv:pylint]
+usedevelop = False
 deps =
     pylint<2
     -r{toxinidir}/CI_REQUIREMENTS.txt
@@ -123,11 +90,13 @@ ignore =
 # Multi-line docstring summary should start at the second line
 
 [testenv:docs]
+usedevelop = False
 deps =
     sphinx
 commands = python setup.py build_sphinx
 
 [testenv:bandit]
+usedevelop = False
 deps = bandit
 commands = bandit -r advanced_descriptors
 
@@ -145,6 +114,7 @@ commands =
     black advanced_descriptors
 
 [testenv:mypy]
+usedevelop = False
 deps =
     mypy>=0.630
     -r{toxinidir}/CI_REQUIREMENTS.txt