From 8a24157341d971f374ac4d63c9158e6173112148 Mon Sep 17 00:00:00 2001 From: Andrew Montanez Date: Thu, 25 May 2023 13:58:50 -0500 Subject: [PATCH 1/6] =?UTF-8?q?Bump=20version:=200.7.3=20=E2=86=92=200.7.4?= =?UTF-8?q?.dev0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ctgan/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ctgan/__init__.py b/ctgan/__init__.py index 0f3ff219..5f1bfb22 100644 --- a/ctgan/__init__.py +++ b/ctgan/__init__.py @@ -4,7 +4,7 @@ __author__ = 'DataCebo, Inc.' __email__ = 'info@sdv.dev' -__version__ = '0.7.3' +__version__ = '0.7.4.dev0' from ctgan.demo import load_demo from ctgan.synthesizers.ctgan import CTGAN diff --git a/setup.cfg b/setup.cfg index 44aa5dee..8fa81387 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.7.3 +current_version = 0.7.4.dev0 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 c623e8f2..b8d17bbb 100644 --- a/setup.py +++ b/setup.py @@ -117,6 +117,6 @@ test_suite='tests', tests_require=tests_require, url='https://github.com/sdv-dev/CTGAN', - version='0.7.3', + version='0.7.4.dev0', zip_safe=False, ) From 801db253a377ff9e2acdba2b951150375e980974 Mon Sep 17 00:00:00 2001 From: Felipe Alex Hofmann Date: Mon, 12 Jun 2023 08:57:33 -0400 Subject: [PATCH 2/6] remove packaging (#297) --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index b8d17bbb..21cb18ce 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,6 @@ history = history_file.read() install_requires = [ - 'packaging>=20,<22', "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'", From 63cd6c9e003bfad7b02f611420205a73a441f4d4 Mon Sep 17 00:00:00 2001 From: Felipe Alex Hofmann Date: Fri, 7 Jul 2023 10:14:05 -0700 Subject: [PATCH 3/6] Remove py37 support (#304) * Remove py37 * missing 37 --- .github/workflows/integration.yml | 2 +- .github/workflows/lint.yml | 4 ++-- .github/workflows/minimum.yml | 2 +- .github/workflows/readme.yml | 2 +- .github/workflows/unit.yml | 2 +- setup.py | 3 +-- tox.ini | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 8aff507e..c2c7d891 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'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index cfe84fcb..967c1b2a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,10 +10,10 @@ jobs: runs-on: ubuntu-20.04 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 862b0a67..d59a17e7 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'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 diff --git a/.github/workflows/readme.yml b/.github/workflows/readme.yml index a27919ee..5a0d0c54 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'] 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 97d6edca..166dd34a 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'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 diff --git a/setup.py b/setup.py index 21cb18ce..013f770a 100644 --- a/setup.py +++ b/setup.py @@ -86,7 +86,6 @@ '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', @@ -111,7 +110,7 @@ keywords='ctgan CTGAN', name='ctgan', packages=find_packages(include=['ctgan', 'ctgan.*']), - python_requires='>=3.7,<3.11', + python_requires='>=3.8,<3.11', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, diff --git a/tox.ini b/tox.ini index 8b1caedb..d615278c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py38-lint, py3{7,8,9,10}-{unit,integration,readme} +envlist = py39-lint, py3{8,9,10}-{unit,integration,readme} [testenv] skipsdist = false From 186f2f0d8b2d8edaa95e9ca206cb2445d5b787e0 Mon Sep 17 00:00:00 2001 From: Felipe Alex Hofmann Date: Mon, 10 Jul 2023 10:02:24 -0700 Subject: [PATCH 4/6] Add py311 support (#303) * Add 3.11 * Fix py311 * typo * Triple equal... * Add 3.11 again * . * add == comparison * . * tox.ini * Remove == * Fix rebase * Fix rebase 2 --- .github/workflows/integration.yml | 7 +------ .github/workflows/minimum.yml | 12 +----------- .github/workflows/readme.yml | 2 +- .github/workflows/unit.yml | 10 +--------- setup.py | 9 ++++++--- tox.ini | 2 +- 6 files changed, 11 insertions(+), 31 deletions(-) diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index c2c7d891..5ed54136 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.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/minimum.yml b/.github/workflows/minimum.yml index d59a17e7..e56b5a5e 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.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 5a0d0c54..b3a44130 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.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 166dd34a..4805cc3a 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.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,17 +18,9 @@ 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 python -m pip install invoke .[test] - name: Run unit tests run: invoke unit - - if: matrix.os == 'ubuntu-latest' && matrix.python-version == 3.8 - name: Upload codecov report - uses: codecov/codecov-action@v2 diff --git a/setup.py b/setup.py index 013f770a..c7779e9a 100644 --- a/setup.py +++ b/setup.py @@ -15,10 +15,12 @@ "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'", "scikit-learn>=1.1.3,<2;python_version>='3.10'", "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'", 'rdt>=1.3.0,<2.0', ] @@ -89,6 +91,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 tabular synthetic data using a conditional GAN', @@ -110,7 +113,7 @@ keywords='ctgan CTGAN', name='ctgan', packages=find_packages(include=['ctgan', 'ctgan.*']), - python_requires='>=3.8,<3.11', + python_requires='>=3.8,<3.12', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, diff --git a/tox.ini b/tox.ini index d615278c..e7fc1ac6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py39-lint, py3{8,9,10}-{unit,integration,readme} +envlist = py39-lint, py3{8,9,10,11}-{unit,integration,readme} [testenv] skipsdist = false From f1d28779bda0e2303c6cbb261146266a643f490c Mon Sep 17 00:00:00 2001 From: Andrew Montanez Date: Mon, 24 Jul 2023 14:43:30 -0500 Subject: [PATCH 5/6] =?UTF-8?q?Bump=20version:=200.7.4.dev0=20=E2=86=92=20?= =?UTF-8?q?0.7.4.dev1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ctgan/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ctgan/__init__.py b/ctgan/__init__.py index 5f1bfb22..568dbc3d 100644 --- a/ctgan/__init__.py +++ b/ctgan/__init__.py @@ -4,7 +4,7 @@ __author__ = 'DataCebo, Inc.' __email__ = 'info@sdv.dev' -__version__ = '0.7.4.dev0' +__version__ = '0.7.4.dev1' from ctgan.demo import load_demo from ctgan.synthesizers.ctgan import CTGAN diff --git a/setup.cfg b/setup.cfg index 8fa81387..041193e5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.7.4.dev0 +current_version = 0.7.4.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 c7779e9a..35284f6f 100644 --- a/setup.py +++ b/setup.py @@ -118,6 +118,6 @@ test_suite='tests', tests_require=tests_require, url='https://github.com/sdv-dev/CTGAN', - version='0.7.4.dev0', + version='0.7.4.dev1', zip_safe=False, ) From 89794bfd3c6378972934fadea6146e3b80a8c28f Mon Sep 17 00:00:00 2001 From: Andrew Montanez Date: Tue, 25 Jul 2023 11:59:22 -0500 Subject: [PATCH 6/6] 0.7.4 Release Notes (#308) * 0.7.4 Release Notes * capitalizing python * fixing date --- HISTORY.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index 4db5dd00..ec42d6ca 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,5 +1,15 @@ # History +## v0.7.4 - 2023-07-25 + +This release adds support for Python 3.11 and drops support for Python 3.7. + +### Maintenance + +* Why is there an upper bound in the packaging requirement? (packaging<22) - Issue [#276](https://github.com/sdv-dev/CTGAN/issues/276) by @fealho +* Add support for Python 3.11 - Issue [#296](https://github.com/sdv-dev/CTGAN/issues/296) by @fealho +* Drop support for Python 3.7 - Issue [#302](https://github.com/sdv-dev/CTGAN/issues/302) by @fealho + ## v0.7.3 - 2023-05-25 This release adds support for Torch 2.0!