diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 70be79f..5bf8e60 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -18,11 +18,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - if: matrix.os == 'windows-latest' - name: Install dependencies - Windows - run: | - python -m pip install --upgrade pip - python -m pip install 'torch>=1.8,<2' -f https://download.pytorch.org/whl/cpu/torch/ - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 5524c3c..fd795ac 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 - - name: Set up Python 3.8 + - name: Set up Python 3.9 uses: actions/setup-python@v2 with: - python-version: 3.8 + python-version: 3.9 - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/.github/workflows/minimum.yml b/.github/workflows/minimum.yml index 862b0a6..e56b5a5 100644 --- a/.github/workflows/minimum.yml +++ b/.github/workflows/minimum.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -18,16 +18,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - 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 diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index a27919e..b3a4413 100644 --- a/.github/workflows/readme.yml +++ b/.github/workflows/readme.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-latest, macos-latest] # skip windows bc rundoc fails steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 12f7245..4805cc3 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -10,7 +10,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.7', '3.8', '3.9', '3.10'] + python-version: ['3.8', '3.9', '3.10', '3.11'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -18,11 +18,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - if: matrix.os == 'windows-latest' - name: Install dependencies - Windows - run: | - python -m pip install --upgrade pip - python -m pip install 'torch>=1.8,<2' -f https://download.pytorch.org/whl/cpu/torch/ - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/HISTORY.md b/HISTORY.md index 5eb9616..9711fc5 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,14 @@ # History +## 0.4.2 - 2023-07-25 + +This release drops support for Python 3.7 and adds support for Python 3.11. + +### Maintenance + +* Add support for Python 3.11 - Issue [#74](https://github.com/sdv-dev/DeepEcho/issues/74) by @fealho +* Drop support for Python 3.7 - Issue [#75](https://github.com/sdv-dev/DeepEcho/issues/75) by @R-Palazzo + ## 0.4.1 - 2023-05-02 This release adds support for Pandas 2.0 and PyTorch 2.0! diff --git a/INSTALL.md b/INSTALL.md index c82f9dd..132da72 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -3,7 +3,7 @@ ## Requirements **DeepEcho** has been developed and tested on -[Python 3.7, 3.8, 3.9, 3.10 and 3.11](https://www.python.org/downloads/) +[Python 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 diff --git a/deepecho/__init__.py b/deepecho/__init__.py index c263f3e..66fad8e 100644 --- a/deepecho/__init__.py +++ b/deepecho/__init__.py @@ -2,7 +2,7 @@ __author__ = 'DataCebo, Inc.' __email__ = 'info@sdv.dev' -__version__ = '0.4.1' +__version__ = '0.4.2.dev1' __path__ = __import__('pkgutil').extend_path(__path__, __name__) from deepecho.demo import load_demo diff --git a/setup.cfg b/setup.cfg index 9448a71..0ad9734 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.4.1 +current_version = 0.4.2.dev1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)(\.(?P[a-z]+)(?P\d+))? diff --git a/setup.py b/setup.py index 3bc1317..c8bd652 100644 --- a/setup.py +++ b/setup.py @@ -15,9 +15,11 @@ "numpy>=1.20.0,<2;python_version<'3.10'", "numpy>=1.23.3,<2;python_version>='3.10'", "pandas>=1.1.3;python_version<'3.10'", - "pandas>=1.3.4;python_version>='3.10'", + "pandas>=1.3.4;python_version>='3.10' and python_version<'3.11'", + "pandas>=1.5.0;python_version>='3.11'", "torch>=1.8.0;python_version<'3.10'", - "torch>=1.11.0;python_version>='3.10'", + "torch>=1.11.0;python_version>='3.10' and python_version<'3.11'", + "torch>=2.0.0;python_version>='3.11'", 'tqdm>=4.15,<5', ] @@ -86,10 +88,10 @@ 'License :: Free for non-commercial use', 'Natural Language :: English', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', 'Topic :: Scientific/Engineering :: Artificial Intelligence', ], description='Create sequential synthetic data of mixed types using a GAN.', @@ -105,11 +107,11 @@ long_description_content_type='text/markdown', name='deepecho', packages=find_packages(include=['deepecho', 'deepecho.*']), - python_requires='>=3.7,<3.11', + python_requires='>=3.8,<3.12', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, url='https://github.com/sdv-dev/DeepEcho', - version='0.4.1', + version='0.4.2.dev1', zip_safe=False, ) diff --git a/tox.ini b/tox.ini index 7828572..65681eb 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-lint, py3{7,8,9,10}-{readme,unit,integration,minimum,tutorials} +envlist = py38-lint, py3{8,9,10,11}-{readme,unit,integration,minimum,tutorials} [testenv] skipsdist = false