Support Python 3.10 and 3.11 (#65)

* Bump torch version for py311

* remove py311 for other os than ubuntu

* Fix minimum version torch windows

* fix tasks

* Remove meta.yaml from bumpversion

* Drop python3.11

* Fix versions

* Update tox

Author: pvk-developer

.github/workflows/integration.yml

@@ -6,20 +6,18 @@ on:
     types: [opened, reopened]
 
 jobs:
-  unit:
+  integration:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - if: matrix.os == 'windows-latest' && matrix.python-version == 3.6
-      run: python -m pip install pywinpty==2.0.1
     - if: matrix.os == 'windows-latest'
       name: Install dependencies - Windows
       run: |

.github/workflows/minimum.yml

@@ -10,21 +10,24 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - if: matrix.os == 'windows-latest' && matrix.python-version == 3.6
-      run: python -m pip install pywinpty==2.0.1
-    - if: matrix.os == 'windows-latest'
+    - if: matrix.os == 'windows-latest' && matrix.python-version != 3.10
       name: Install dependencies - Windows
       run: |
           python -m pip install --upgrade pip
           python -m pip install 'torch==1.8' -f https://download.pytorch.org/whl/cpu/torch/
+    - if: matrix.os == 'windows-latest' && matrix.python-version == 3.10
+      name: Install dependencies - Windows
+      run: |
+          python -m pip install --upgrade pip
+          python -m pip install 'torch==1.11.0' -f https://download.pytorch.org/whl/cpu/torch/
     - name: Install dependencies
       run: |
           python -m pip install --upgrade pip

.github/workflows/readme.yml

@@ -10,8 +10,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        os: [ubuntu-20.04, macos-latest]   # skip windows bc rundoc fails
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        os: [ubuntu-latest, macos-latest]  # skip windows bc rundoc fails
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/unit.yml

@@ -10,16 +10,14 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
-        os: [ubuntu-20.04, macos-latest, windows-latest]
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - if: matrix.os == 'windows-latest' && matrix.python-version == 3.6
-      run: python -m pip install pywinpty==2.0.1
     - if: matrix.os == 'windows-latest'
       name: Install dependencies - Windows
       run: |

INSTALL.md

@@ -2,7 +2,8 @@
 
 ## Requirements
 
-**DeepEcho** has been developed and tested on [Python 3.6, 3.7, 3.8 and 3.9](https://www.python.org/downloads/)
+**DeepEcho** has been developed and tested on
+[Python 3.7, 3.8, 3.9, 3.10 and 3.11](https://www.python.org/downloads/)
 
 Also, although it is not strictly required, the usage of a [virtualenv](
 https://virtualenv.pypa.io/en/latest/) is highly recommended in order to avoid

setup.cfg

@@ -24,10 +24,6 @@ replace = version='{new_version}'
 search = __version__ = '{current_version}'
 replace = __version__ = '{new_version}'
 
-[bumpversion:file:conda/meta.yaml]
-search = version = '{current_version}'
-replace = version = '{new_version}'
-
 [bdist_wheel]
 universal = 1
 

setup.py

@@ -12,10 +12,12 @@
     history = history_file.read()
 
 install_requires = [
-    "numpy>=1.18.0,<1.20.0;python_version<'3.7'",
-    "numpy>=1.20.0,<2;python_version>='3.7'",
-    'pandas>=1.1.3,<2',
-    'torch>=1.8.0,<2',
+    "numpy>=1.20.0,<2;python_version<'3.10'",
+    "numpy>=1.23.3,<2;python_version>='3.10'",
+    "pandas>=1.1.3,<2;python_version<'3.10'",
+    "pandas>=1.3.4,<2;python_version>='3.10'",
+    "torch>=1.8.0,<2;python_version<'3.10'",
+    "torch>=1.11.0,<2;python_version>='3.10'",
     'tqdm>=4.15,<5',
 ]
 
@@ -84,10 +86,10 @@
         'License :: Free for non-commercial use',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10',
         'Topic :: Scientific/Engineering :: Artificial Intelligence',
     ],
     description='Create sequential synthetic data of mixed types using a GAN.',
@@ -103,7 +105,7 @@
     long_description_content_type='text/markdown',
     name='deepecho',
     packages=find_packages(include=['deepecho', 'deepecho.*']),
-    python_requires='>=3.6,<3.10',
+    python_requires='>=3.7,<3.11',
     setup_requires=setup_requires,
     test_suite='tests',
     tests_require=tests_require,

tasks.py

@@ -1,7 +1,9 @@
 import glob
+import inspect
 import operator
 import os
 import re
+import pkg_resources
 import platform
 import shutil
 import stat
@@ -17,6 +19,11 @@
     '<=': operator.le
 }
 
+
+if not hasattr(inspect, 'getargspec'):
+    inspect.getargspec = inspect.getfullargspec
+
+
 @task
 def check_dependencies(c):
     c.run('python -m pip check')
@@ -33,15 +40,18 @@ def unit(c):
 
 
 def _validate_python_version(line):
-    python_version_match = re.search(r"python_version(<=?|>=?)\'(\d\.?)+\'", line)
-    if python_version_match:
+    is_valid = True
+    for python_version_match in re.finditer(r"python_version(<=?|>=?|==)\'(\d\.?)+\'", line):
         python_version = python_version_match.group(0)
-        comparison = re.search(r'(>=?|<=?)', python_version).group(0)
+        comparison = re.search(r'(>=?|<=?|==)', python_version).group(0)
         version_number = python_version.split(comparison)[-1].replace("'", "")
         comparison_function = COMPARISONS[comparison]
-        return comparison_function(platform.python_version(), version_number)
+        is_valid = is_valid and comparison_function(
+            pkg_resources.parse_version(platform.python_version()),
+            pkg_resources.parse_version(version_number),
+        )
 
-    return True
+    return is_valid
 
 
 @task
@@ -56,7 +66,7 @@ def install_minimum(c):
             if line == ']':
                 break
 
-            line = line.strip()            
+            line = line.strip()
             if _validate_python_version(line):
                 requirement = re.match(r'[^>]*', line).group(0)
                 requirement = re.sub(r"""['",]""", '', requirement)

tox.ini

@@ -1,12 +1,5 @@
 [tox]
-envlist = py3{6,7,8,9}-{lint,readme,pytest,minimum}
-
-[gh-actions]
-python =
-    3.9: py39-lint, py39-readme, py39-pytest, py39-minimum, py39-tutorials
-    3.8: py38-lint, py38-readme, py38-pytest, py38-minimum, py38-tutorials
-    3.7: py37-lint, py37-readme, py37-pytest, py37-minimum, py37-tutorials
-    3.6: py36-lint, py36-readme, py36-pytest, py36-minimum, py36-tutorials
+envlist = py38-lint, py3{7,8,9,10}-{readme,unit,integration,minimum,tutorials}
 
 [testenv]
 skipsdist = false