make release-tag: Merge branch 'master' into stable

.github/workflows/integration.yml

@@ -10,19 +10,14 @@ 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
     - name: Set up Python ${{ matrix.python-version }}
       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

.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

.github/workflows/minimum.yml

@@ -10,24 +10,14 @@ 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
     - 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.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,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

.github/workflows/unit.yml

@@ -10,25 +10,17 @@ 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
     - name: Set up Python ${{ matrix.python-version }}
       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

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!

ctgan/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = 'DataCebo, Inc.'
 __email__ = 'info@sdv.dev'
-__version__ = '0.7.3'
+__version__ = '0.7.4.dev1'
 
 from ctgan.demo import load_demo
 from ctgan.synthesizers.ctgan import CTGAN

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.3
+current_version = 0.7.4.dev1
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?

setup.py

@@ -12,14 +12,15 @@
     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'",
-    "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',
 ]
 
@@ -87,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 tabular synthetic data using a conditional GAN',
@@ -112,11 +113,11 @@
     keywords='ctgan CTGAN',
     name='ctgan',
     packages=find_packages(include=['ctgan', 'ctgan.*']),
-    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/CTGAN',
-    version='0.7.3',
+    version='0.7.4.dev1',
     zip_safe=False,
 )

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,11}-{unit,integration,readme}
 
 [testenv]
 skipsdist = false