diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b15bf4a..36e7e8e 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - name: Python uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.9 - name: Build run: | diff --git a/.github/workflows/latest-dependencies.yml b/.github/workflows/latest-dependencies.yml index 425c08c..94cf4c3 100644 --- a/.github/workflows/latest-dependencies.yml +++ b/.github/workflows/latest-dependencies.yml @@ -8,10 +8,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - 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: Update dependencies run: | python -m pip install --upgrade pip @@ -27,4 +27,4 @@ jobs: branch: latest-dep-update branch-suffix: short-commit-hash base: master - team-reviewers: core \ No newline at end of file + team-reviewers: core diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f56a633..e1f7e5c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.8] + python-version: ['3.9'] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -29,8 +29,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8'] - os: [ubuntu-20.04] + python-version: ['3.9'] + os: [ubuntu-latest] steps: - uses: actions/checkout@v1 - name: Set up Python ${{ matrix.python-version }} @@ -47,8 +47,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] - os: [ubuntu-20.04, macos-latest, windows-latest] + python-version: ['3.9', '3.10', '3.11', '3.12'] + os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 - name: Set up Python ${{ matrix.python-version }} @@ -68,8 +68,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ['3.8', '3.9', '3.10', '3.11'] - os: [ubuntu-20.04, macos-latest] + python-version: ['3.9', '3.10', '3.11', '3.12'] + os: [ubuntu-latest, macos-latest] steps: - uses: actions/checkout@v1 - name: Set up Python ${{ matrix.python-version }} @@ -79,4 +79,4 @@ jobs: - name: Install package and dependencies run: pip install invoke .[test] - name: invoke minimum - run: invoke minimum \ No newline at end of file + run: invoke minimum diff --git a/README.md b/README.md index cbf88dc..b490756 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ in order to solve time series machine learning problems. ## Requirements -**SigPro** has been developed and tested on [Python 3.8, 3.9, 3.10, and 3.11](https://www.python.org/downloads/) +**SigPro** has been developed and tested on [Python 3.9, 3.10, 3.11 and 3.12](https://www.python.org/downloads/) on GNU/Linux and macOS systems. Also, although it is not strictly required, the usage of a [virtualenv]( diff --git a/setup.py b/setup.py index 6667212..60e94a6 100644 --- a/setup.py +++ b/setup.py @@ -12,10 +12,10 @@ history = history_file.read() install_requires = [ - 'mlblocks>=0.6.1', + 'mlblocks>=0.6.2', 'pandas>=1.5.3', - 'numpy>=1.24.4', - 'scipy>=1.10.1', + 'numpy>=1.26.0', + 'scipy>=1.11.3', ] setup_requires = [ @@ -41,7 +41,16 @@ 'sphinx_rtd_theme>=0.2.4,<0.5', 'autodocsumm>=0.1.10', 'markupsafe<2.1.0', - 'Jinja2>=2,<3', + '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', @@ -62,7 +71,8 @@ # Advanced testing 'coverage>=4.5.1,<6', 'tox>=2.9.1,<4', - 'importlib-metadata<2,>=0.12', + 'importlib-metadata<5', + 'mistune<2', 'invoke', ] @@ -75,12 +85,12 @@ 'License :: OSI Approved :: MIT License', 'Natural Language :: English', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], - description='Signal Processing Tools for Machine Mearning', + description='Signal Processing Tools for Machine Learning', entry_points={ 'mlblocks': [ 'primitives=sigpro:MLBLOCKS_PRIMITIVES', @@ -98,7 +108,7 @@ long_description_content_type='text/markdown', name='sigpro', packages=find_packages(include=['sigpro', 'sigpro.*']), - python_requires='>=3.8,<3.12', + python_requires='>=3.9,<3.13', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, diff --git a/tests/integration/test_pipeline.py b/tests/integration/test_pipeline.py index e855ed4..4ce55af 100644 --- a/tests/integration/test_pipeline.py +++ b/tests/integration/test_pipeline.py @@ -39,7 +39,11 @@ def _verify_pipeline_outputs(sigpro_pipeline, input_data, output_data, columns_t assert column in feature_list assert column in processed_signal.columns cols_reduced = [i for i in columns_to_check if i in output_data.columns] - pd.testing.assert_frame_equal(processed_signal[cols_reduced], output_data[cols_reduced]) + pd.testing.assert_frame_equal( + processed_signal[cols_reduced], + output_data[cols_reduced], + rtol=1e-2 + ) def test_linear_pipeline():