Dropping support of Python 2.7

.travis.yml

@@ -1,8 +1,7 @@
 language: python
 python:
-- '2.7'
 - '3.6'
-#- '3.7-dev'
+- '3.7-dev'
 
 git:
   depth: 200
@@ -14,9 +13,9 @@ before_install:
   - gcc --version
   - export START=$(pwd)
 install:
-- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
-  -O miniconda.sh; export VADD="py27"; else wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-  -O miniconda.sh; export VADD="py36";  fi
+- if [[ "$TRAVIS_PYTHON_VERSION" == "3.7-dev" ]]; then export VADD="py37"; else export VADD="py36";  fi
+- wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
+  -O miniconda.sh
 - bash miniconda.sh -b -p $HOME/miniconda
 - export PATH="$HOME/miniconda/bin:$PATH"
 - hash -r

README.md

@@ -124,15 +124,14 @@ Do you want to use **tofu** on IMAS and don't know where to start? [See our wiki
 Install dependencies
 
 
-    python (2.7 or 3)
+    python (>= 3)
     numpy
     scipy
     matplotlib
     cython >= 0.26
     nose
     pygments
     pandas
-    polygon3 (or polygon2 if you are using python 2.7)
 
 
 Checkout the tofu git repository and from the top directory

conda_recipe/meta.yaml

@@ -29,7 +29,6 @@ requirements:
     - cython >=0.26
     - nose
     - pygments
-    - funcsigs # [py27]
 
 
   # for running the library
@@ -43,7 +42,6 @@ requirements:
     - cython >=0.26
     - nose
     - pygments
-    - funcsigs # [py27]
 
 test:
   requires:

setup.py

@@ -153,17 +153,8 @@ def check_for_openmp(cc_var):
     openmp_installed = not check_for_openmp("cc")
 print("................ checking if openmp installed... > ", openmp_installed)
 
-# To compile the relevant version
-if sys.version[:3] in ["2.7", "3.6", "3.7"]:
-    gg = "_GG0%s" % sys.version[0]
-else:
-    raise Exception("Pb. with python version in setup.py file: " + sys.version)
 
 
-if sys.version[0] == "2":
-    extralib = ["funcsigs"]
-else:
-    extralib = []
 # ==============================================================================
 
 
@@ -176,30 +167,19 @@ def get_version_tofu(path=_HERE):
     isgit = ".git" in os.listdir(path)
     if isgit:
         try:
-            if sys.version[0] == "2":
-                git_branch = subprocess.check_output(
+            git_branch = (
+                subprocess.check_output(
                     [
                         "git",
                         "rev-parse",
                         "--symbolic-full-name",
                         "--abbrev-ref",
                         "HEAD",
                     ]
-                ).rstrip()
-            elif sys.version[0] == "3":
-                git_branch = (
-                    subprocess.check_output(
-                        [
-                            "git",
-                            "rev-parse",
-                            "--symbolic-full-name",
-                            "--abbrev-ref",
-                            "HEAD",
-                        ]
-                    )
-                    .rstrip()
-                    .decode()
                 )
+                .rstrip()
+                .decode()
+            )
             if git_branch in ["master"]:
                 version_tofu = up.updateversion(os.path.join(path, "tofu"))
             else:
@@ -224,14 +204,6 @@ def get_version_tofu(path=_HERE):
 print("")
 
 
-# Getting relevant compilable files
-if sys.version[0] == "3":
-    # if not '_GG03.pyx' in os.listdir(os.path.join(_HERE,'tofu/geom/')):
-    shutil.copy2(
-        os.path.join(_HERE, "tofu/geom/_GG02.pyx"),
-        os.path.join(_HERE, "tofu/geom/_GG03.pyx"),
-    )
-
 # Get the long description from the README file
 # Get the readme file whatever its extension (md vs rst)
 _README = [
@@ -259,8 +231,8 @@ def get_version_tofu(path=_HERE):
 
 extensions = [
     Extension(
-        name="tofu.geom." + gg,
-        sources=["tofu/geom/" + gg + ".pyx"],
+        name="tofu.geom._GG",
+        sources=["tofu/geom/_GG.pyx"],
         extra_compile_args=extra_compile_args,
         extra_link_args=extra_link_args,
     ),
@@ -300,7 +272,6 @@ def get_version_tofu(path=_HERE):
 
 setup(
     name="tofu",
-    # version="1.2.27",
     version="{ver}".format(ver=version_tofu),
     # Use scm to get code version from git tags
     # cf. https://pypi.python.org/pypi/setuptools_scm
@@ -335,7 +306,6 @@ def get_version_tofu(path=_HERE):
         "License :: OSI Approved :: MIT License",
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
-        "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         # In which language most of the code is written ?
@@ -368,9 +338,8 @@ def get_version_tofu(path=_HERE):
     # your project is installed. For an analysis of "install_requires" vs pip's
     # requirements files see:
     # https://packaging.python.org/en/latest/requirements.html
-    install_requires=["numpy", "scipy", "matplotlib", "cython>=0.26"]
-    + extralib,
-    python_requires=">=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*",
+    install_requires=["numpy", "scipy", "matplotlib", "cython>=0.26"],
+    python_requires=">=3.6",
     # List additional groups of dependencies here (e.g. development
     # dependencies). You can install these using the following syntax,
     # for example:

tofu/data/_core.py

@@ -7,11 +7,7 @@
 import copy
 import warnings
 from abc import ABCMeta, abstractmethod
-if sys.version[0] == '3':
-    import inspect
-else:
-    # Python 2 back-porting
-    import funcsigs as inspect
+import inspect
 
 # Common
 import numpy as np
@@ -173,11 +169,6 @@ def __init__(self, data=None, t=None, X=None, lamb=None,
                  fromdict=None, SavePath=os.path.abspath('./'),
                  SavePath_Include=tfpf.defInclude):
 
-        # To replace __init_subclass__ for Python 2
-        if sys.version[0]=='2':
-            self._dstrip = utils.ToFuObjectBase._dstrip.copy()
-            self.__class__._strip_init()
-
         # Create a dplot at instance level
         #self._dplot = copy.deepcopy(self.__class__._dplot)
 
@@ -817,10 +808,7 @@ def _strip_init(cls):
                  2: dgeom pathfiles + clear data
                  """
         doc = utils.ToFuObjectBase.strip.__doc__.format(doc,nMax)
-        if sys.version[0]=='2':
-            cls.strip.__func__.__doc__ = doc
-        else:
-            cls.strip.__doc__ = doc
+        cls.strip.__doc__ = doc
 
     def strip(self, strip=0, verb=True):
         # super()
@@ -2281,11 +2269,6 @@ def __init__(self, dtime=None, dradius=None, d0d=None, d1d=None,
                  fromdict=None, SavePath=os.path.abspath('./'),
                  SavePath_Include=tfpf.defInclude):
 
-        # To replace __init_subclass__ for Python 2
-        if sys.version[0]=='2':
-            self._dstrip = utils.ToFuObjectBase._dstrip.copy()
-            self.__class__._strip_init()
-
         # Create a dplot at instance level
         #self._dplot = copy.deepcopy(self.__class__._dplot)
 
@@ -2839,10 +2822,7 @@ def _strip_init(cls):
                  1: dgeom pathfiles
                  """
         doc = utils.ToFuObjectBase.strip.__doc__.format(doc,nMax)
-        if sys.version[0]=='2':
-            cls.strip.__func__.__doc__ = doc
-        else:
-            cls.strip.__doc__ = doc
+        cls.strip.__doc__ = doc
 
     def strip(self, strip=0, verb=True):
         # super()

tofu/data/_core_new.py

@@ -7,11 +7,7 @@
 import copy
 import warnings
 from abc import ABCMeta, abstractmethod
-if sys.version[0] == '3':
-    import inspect
-else:
-    # Python 2 back-porting
-    import funcsigs as inspect
+import inspect
 
 # Common
 import numpy as np
@@ -86,11 +82,6 @@ def __init__(self, dref=None, ddata=None,
                  fromdict=None, SavePath=os.path.abspath('./'),
                  SavePath_Include=tfpf.defInclude):
 
-        # To replace __init_subclass__ for Python 2
-        if sys.version[0] == '2':
-            self._dstrip = utils.ToFuObjectBase._dstrip.copy()
-            self.__class__._strip_init()
-
         # Create a dplot at instance level
         # self._dplot = copy.deepcopy(self.__class__._dplot)
 
@@ -495,10 +486,7 @@ def _strip_init(cls):
                  1: None
                  """
         doc = utils.ToFuObjectBase.strip.__doc__.format(doc, nMax)
-        if sys.version[0] == '2':
-            cls.strip.__func__.__doc__ = doc
-        else:
-            cls.strip.__doc__ = doc
+        cls.strip.__doc__ = doc
 
     def strip(self, strip=0, verb=True):
         # super()