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

sdv-dev · May 2, 2023 · f8b05b2 · f8b05b2
2 parents b15b1b5 + d778951
commit f8b05b2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,5 +1,23 @@
 # History
 
+## 0.4.1 - 2023-05-02
+
+This release adds support for Pandas 2.0 and PyTorch 2.0!
+
+### Maintenance
+
+* Remove upper bound for pandas - Issue [#69](https://github.com/sdv-dev/DeepEcho/issues/69) by @frances-h
+* Upgrade to Torch 2.0 - Issue [#70](https://github.com/sdv-dev/DeepEcho/issues/70) by @frances-h
+
+## 0.4.0 - 2023-01-10
+
+This release adds support for python 3.10 and 3.11. It also drops support for python 3.6.
+
+### Maintenance
+
+* Support Python 3.10 and 3.11 - Issue [#63](https://github.com/sdv-dev/DeepEcho/issues/63) by @pvk-developer
+* DeepEcho Package Maintenance Updates - Issue [#62](https://github.com/sdv-dev/DeepEcho/issues/62) by @pvk-developer
+
 ## 0.3.0 - 2021-11-15
 
 This release adds support for Python 3.9 and updates dependencies to ensure compatibility with the rest

diff --git a/deepecho/__init__.py b/deepecho/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = 'DataCebo, Inc.'
 __email__ = 'info@sdv.dev'
-__version__ = '0.4.0'
+__version__ = '0.4.1.dev1'
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
 from deepecho.demo import load_demo

diff --git a/deepecho/models/base.py b/deepecho/models/base.py
@@ -248,6 +248,6 @@ def sample(self, num_entities=None, context=None, sequence_length=None):
             for column, value in zip(self._context_columns, context_values):
                 group[column] = value
 
-            output = output.append(group)
+            output = pd.concat([output, group])
 
         return output[self._output_columns].reset_index(drop=True)
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.4.0
+current_version = 0.4.1.dev1
 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
@@ -14,10 +14,10 @@
 install_requires = [
     "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'",
+    "pandas>=1.1.3;python_version<'3.10'",
+    "pandas>=1.3.4;python_version>='3.10'",
+    "torch>=1.8.0;python_version<'3.10'",
+    "torch>=1.11.0;python_version>='3.10'",
     'tqdm>=4.15,<5',
 ]
 
@@ -110,6 +110,6 @@
     test_suite='tests',
     tests_require=tests_require,
     url='https://github.com/sdv-dev/DeepEcho',
-    version='0.4.0',
+    version='0.4.1.dev1',
     zip_safe=False,
 )