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

amontanez24 · amontanez24 · commit cc79c14946dc · 2023-05-09T12:51:59.000-05:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,25 @@
 # History
 
+## v0.7.2 - 2023-05-09
+
+This release adds support for Pandas 2.0! It also fixes a bug in the `load_demo` function.
+
+### Bugs Fixed
+
+* load_demo raises urllib.error.HTTPError: HTTP Error 403: Forbidden - Issue [#284](https://github.com/sdv-dev/CTGAN/issues/284) by @amontanez24
+
+### Maintenance
+
+* Remove upper bound for pandas - Issue [#282](https://github.com/sdv-dev/CTGAN/issues/282) by @frances-h
+
+## v0.7.1 - 2023-02-23
+
+This release fixes a bug that prevented the `CTGAN` model from being saved after sampling.
+
+### Bugs Fixed
+
+* Cannot save CTGANSynthesizer after sampling (TypeError) - Issue [#270](https://github.com/sdv-dev/CTGAN/issues/270) by @pvk-developer
+
 ## v0.7.0 - 2023-01-20
 
 This release adds support for python 3.10 and drops support for python 3.6. It also fixes a couple of the most common warnings that were surfacing.
diff --git a/ctgan/__init__.py b/ctgan/__init__.py
@@ -4,7 +4,7 @@
 
 __author__ = 'DataCebo, Inc.'
 __email__ = 'info@sdv.dev'
-__version__ = '0.7.1'
+__version__ = '0.7.2.dev2'
 
 from ctgan.demo import load_demo
 from ctgan.synthesizers.ctgan import CTGAN
diff --git a/ctgan/demo.py b/ctgan/demo.py
@@ -2,7 +2,7 @@
 
 import pandas as pd
 
-DEMO_URL = 'http://ctgan-data.s3.amazonaws.com/census.csv.gz'
+DEMO_URL = 'http://ctgan-demo.s3.amazonaws.com/census.csv.gz'
 
 
 def load_demo():
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.7.1
+current_version = 0.7.2.dev2
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<candidate>\d+))?
diff --git a/setup.py b/setup.py
@@ -15,8 +15,8 @@
     '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,<2;python_version<'3.10'",
-    "pandas>=1.3.4,<2;python_version>='3.10'",
+    "pandas>=1.1.3;python_version<'3.10'",
+    "pandas>=1.3.4;python_version>='3.10'",
     "scikit-learn>=1.1.3,<2;python_version>='3.10'",
     "torch>=1.8.0,<2;python_version<'3.10'",
     "torch>=1.11.0,<2;python_version>='3.10'",
@@ -117,6 +117,6 @@
     test_suite='tests',
     tests_require=tests_require,
     url='https://github.com/sdv-dev/CTGAN',
-    version='0.7.1',
+    version='0.7.2.dev2',
     zip_safe=False,
 )
diff --git a/tasks.py b/tasks.py
@@ -83,7 +83,7 @@ def install_minimum(c):
             if _validate_python_version(line):
                 requirement = re.match(r'[^>]*', line).group(0)
                 requirement = re.sub(r"""['",]""", '', requirement)
-                version = re.search(r'>=?[^(,|#)]*', line).group(0)
+                version = re.search(r'>=?(\d\.?)+', line).group(0)
                 if version:
                     version = re.sub(r'>=?', '==', version)
                     version = re.sub(r"""['",]""", '', version)
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -0,0 +1 @@
+"""Integration testing subpackage."""
diff --git a/tests/integration/synthesizer/__init__.py b/tests/integration/synthesizer/__init__.py
@@ -0,0 +1 @@
+"""Subpackage for integration testing of synthesizers."""
diff --git a/tests/integration/synthesizer/test_ctgan.py b/tests/integration/synthesizer/test_ctgan.py
@@ -239,6 +239,7 @@ def test_continuous():
     #   - uniform (assert p-value > 0.05)
     #   - gaussian (assert p-value > 0.05)
     #   - inversely correlated (assert correlation < 0)
+    pass
 
 
 def test_categorical():
@@ -248,6 +249,7 @@ def test_categorical():
     #   - uniform (assert p-value > 0.05)
     #   - very skewed / biased? (assert p-value > 0.05)
     #   - inversely correlated (assert correlation < 0)
+    pass
 
 
 def test_categorical_log_frequency():
@@ -257,22 +259,26 @@ def test_categorical_log_frequency():
     #   - uniform (assert p-value > 0.05)
     #   - very skewed / biased? (assert p-value > 0.05)
     #   - inversely correlated (assert correlation < 0)
+    pass
 
 
 def test_mixed():
     """Test training the CTGAN synthesizer on a small mixed-type dataset."""
     # assert the distribution of the samples is close to the distribution of the data
     # using a kstest for continuous + a cstest for categorical.
+    pass
 
 
 def test_conditional():
     """Test training the CTGAN synthesizer and sampling conditioned on a categorical."""
     # verify that conditioning increases the likelihood of getting a sample with the specified
     # categorical value
+    pass
 
 
 def test_batch_size_pack_size():
     """Test that if batch size is not a multiple of pack size, it raises a sane error."""
+    pass
 
 
 def test_ctgan_save_and_load(tmpdir):
diff --git a/tests/integration/synthesizer/test_tvae.py b/tests/integration/synthesizer/test_tvae.py
@@ -61,18 +61,21 @@ def test_continuous():
     """Test training the TVAE synthesizer on a small continuous dataset."""
     # verify that the distribution of the samples is close to the distribution of the data
     # using a kstest.
+    pass
 
 
 def test_categorical():
     """Test training the TVAE synthesizer on a small categorical dataset."""
     # verify that the distribution of the samples is close to the distribution of the data
     # using a cstest.
+    pass
 
 
 def test_mixed():
     """Test training the TVAE synthesizer on a small mixed-type dataset."""
     # verify that the distribution of the samples is close to the distribution of the data
     # using a kstest for continuous + a cstest for categorical.
+    pass
 
 
 def test__loss_function():

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+"""Subpackage for integration testing of synthesizers."""`