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

Author: sarahmish

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: ['3.8', '3.9', '3.10', '3.11']
         os: [ubuntu-20.04, macos-latest]
     steps:
     - uses: actions/checkout@v1
@@ -20,15 +20,17 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install package
-      run: pip install .[dev]
+      run: |
+        pip install --upgrade pip setuptools wheel
+        pip install .[dev]
     - name: make test-devel
       run: make test-devel
 
   readme:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: ['3.8', '3.9', '3.10', '3.11']
         os: [ubuntu-20.04, macos-latest]
     steps:
     - uses: actions/checkout@v1
@@ -37,15 +39,17 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install package and dependencies
-      run: pip install rundoc .
+      run: |
+        pip install --upgrade pip setuptools wheel
+        pip install rundoc .
     - name: make test-readme
       run: make test-readme
 
   unit:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: ['3.8', '3.9', '3.10', '3.11']
         os: [ubuntu-20.04, macos-latest]
     steps:
     - uses: actions/checkout@v1
@@ -54,6 +58,8 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install package and dependencies
-      run: pip install .[test]
+      run: |
+        pip install --upgrade pip setuptools wheel
+        pip install .[test]
     - name: make test-unit
       run: make test-unit

HISTORY.md

@@ -1,5 +1,13 @@
 # History
 
+## 0.4.0 - 2024-03-22
+
+### General Imporvements
+
+* Upgrade python versions 3.9, 3.10, and 3.11 - [Issue #279](https://github.com/MLBazaar/MLPrimitives/issues/279) by @sarahmish
+* Adapt to statsmodels.tsa.arima_model.ARIMA deprecation
+ - [Issue #253](https://github.com/MLBazaar/MLPrimitives/issues/253) by @sarahmish
+
 ## 0.3.5 - 2023-04-14
 
 ### General Imporvements

README.md

@@ -39,7 +39,7 @@ combine third party tools or implement new functionalities from scratch.
 
 ## Requirements
 
-**MLPrimitives** has been developed and tested on [Python 3.6, 3.7 and 3.8](https://www.python.org/downloads/)
+**MLPrimitives** has been developed and tested on [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

mlprimitives/__init__.py

@@ -4,7 +4,7 @@
 
 __author__ = 'MIT Data To AI Lab'
 __email__ = '[email protected]'
-__version__ = '0.3.5'
+__version__ = '0.4.0.dev0'
 
 import os
 

mlprimitives/adapters/statsmodels.py

@@ -1,5 +1,5 @@
 import numpy as np
-from statsmodels.tsa import arima_model
+from statsmodels.tsa.arima import model
 
 
 class ARIMA(object):
@@ -45,8 +45,8 @@ def predict(self, X):
 
         num_sequences = len(X)
         for sequence in range(num_sequences):
-            arima = arima_model.ARIMA(X[sequence], order=(self.p, self.d, self.q))
-            arima_fit = arima.fit(disp=0)
+            arima = model.ARIMA(X[sequence], order=(self.p, self.d, self.q))
+            arima_fit = arima.fit()
             arima_results.append(arima_fit.forecast(self.steps)[0])
 
         arima_results = np.asarray(arima_results)

mlprimitives/custom/timeseries_preprocessing.py

@@ -269,4 +269,8 @@ def cutoff_window_sequences(X, timeseries, window_size, cutoff_time=None, time_i
 
         output.append(selected.values)
 
-    return np.array(output)
+    output = np.array(output, dtype=object)
+    if output.ndim >= 2:
+        output = output.astype(float)
+
+    return output

mlprimitives/primitives/xgboost.XGBClassifier.json

@@ -29,7 +29,6 @@
         "args": [
             {
                 "name": "X",
-                "keyword": "data",
                 "type": "ndarray"
             }
         ],

mlprimitives/primitives/xgboost.XGBRegressor.json

@@ -29,7 +29,6 @@
         "args": [
             {
                 "name": "X",
-                "keyword": "data",
                 "type": "ndarray"
             }
         ],

setup.cfg

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

setup.py

@@ -12,24 +12,24 @@
     history = history_file.read()
 
 install_requires = [
-    'Keras>=2.4,<2.5',
+    'Keras>=2.4,<2.15',
     'featuretools>=0.6.1,<0.23',
     'iso639>=0.1.4,<0.2',
     'langdetect>=1.0.7,<2',
     'lightfm>=1.15,<2',
-    'mlblocks>=0.4.0.dev0,<0.7',
+    'mlblocks>=0.6,<0.7',
     'networkx>=2.0,<3',
     'nltk>=3.3,<4',
-    'numpy<1.21.0,>=1.16.0',
+    'numpy>=1.16.0,<2',
     'opencv-python>=3.4.0.12,<4.7',
     'pandas>=1,<2',
     'python-louvain>=0.10,<0.14',   # community
     'scikit-image>=0.15',
     'scikit-learn>=0.21',
     'scipy>=1.1.0,<2',
-    'statsmodels>=0.9.0,<0.13',
-    'tensorflow>=2,<2.5',
-    'xgboost>=0.72.1,<1',
+    'statsmodels>=0.9.0,<0.15',
+    'tensorflow>=2,<2.15',
+    'xgboost>=0.72.1,<2',
     'protobuf<4',
 ]
 
@@ -59,6 +59,15 @@
     'mistune>=0.7,<2',
     'Jinja2>=2,<3.1',
 
+    # fails on Sphinx < v3.4
+    'alabaster<=0.7.12',
+    # fails on Sphins < v5.0
+    'sphinxcontrib-applehelp<1.0.8',
+    'sphinxcontrib-devhelp<1.0.6',
+    'sphinxcontrib-htmlhelp<2.0.5',
+    'sphinxcontrib-serializinghtml<1.1.10',
+    'sphinxcontrib-qthelp<1.0.7',
+    
     # style check
     'flake8>=3.7.7,<4',
     'isort>=4.3.4,<5',
@@ -91,9 +100,10 @@
         'License :: OSI Approved :: MIT License',
         'Natural Language :: English',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.6',
-        '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',
     ],
     description='Pipelines and primitives for machine learning and data science.',
     entry_points = {
@@ -117,11 +127,11 @@
     long_description_content_type='text/markdown',
     name='mlprimitives',
     packages=find_packages(include=['mlprimitives', 'mlprimitives.*']),
-    python_requires='>=3.6,<3.9',
+    python_requires='>=3.8,<3.12',
     setup_requires=setup_requires,
     test_suite='tests',
     tests_require=tests_require,
     url='https://github.com/MLBazaar/MLPrimitives',
-    version='0.3.5',
+    version='0.4.0.dev0',
     zip_safe=False,
 )