diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 66e4715..f031f2b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,7 +28,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.7, 3.8] + python-version: ["3.8", "3.9", "3.10", "3.11"] os: [ubuntu-latest, macos-latest] steps: - uses: actions/checkout@v1 @@ -45,7 +45,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.7, 3.8] + python-version: ["3.8", "3.9", "3.10", "3.11"] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 @@ -62,7 +62,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.7, 3.8] + python-version: ["3.8", "3.9", "3.10", "3.11"] os: [ubuntu-latest, macos-latest, windows-latest] steps: - uses: actions/checkout@v1 diff --git a/setup.py b/setup.py index e45e324..0378b97 100644 --- a/setup.py +++ b/setup.py @@ -18,12 +18,12 @@ history = '' install_requires = [ - 'numpy>=1.16.0,<1.23.0', + 'numpy>=1.19.5,<1.27.0', 'pandas>=1,<2', 'composeml>=0.1.6,<0.10', 'featuretools>=1.0.0,<2.0.0', - 'mlblocks>=0.5.0,<0.6', - 'sigpro>=0.1.1.dev0,<0.1.2', + 'mlblocks>=0.6.0,<0.7', + 'sigpro>=0.2.0', 'xgboost>=0.72.1,<1', 'jupyter==1.0.0', ] @@ -83,9 +83,10 @@ 'Intended Audience :: Developers', '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='Prediction engineering methods for Draco.', entry_points={ @@ -106,7 +107,7 @@ keywords='zephyr Draco Prediction Engineering', name='zephyr-ml', packages=find_packages(include=['zephyr_ml', 'zephyr_ml.*']), - python_requires='>=3.7,<3.9', + python_requires='>=3.8,<3.12', setup_requires=setup_requires, test_suite='tests', tests_require=tests_require, diff --git a/tests/test_core.py b/tests/test_core.py index 244617f..cc747c7 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -31,7 +31,7 @@ def setup_class(cls): }) cls.random_y = [1 if x > 0.5 else 0 for x in np.random.random(100)] - def setup(self): + def setup_method(self): self.zephyr = Zephyr('xgb_classifier') def test_hyperparameters(self): diff --git a/tox.ini b/tox.ini index 8fcdc38..e427b6b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,15 +1,19 @@ [tox] -envlist = py3{7,8}, test-devel +envlist = py3{8,9,10,11}-{lint,readme,pytest,tutorials}, test-devel [travis] python = - 3.8: py38, test-devel - 3.7: py37 + 3.11: py311-lint, py311-readme, py311-pytest, py311-tutorials + 3.10: py310-lint, py310-readme, py310-pytest, py310-tutorials + 3.9: py39-lint, py39-readme, py39-pytest, py39-tutorials + 3.8: py38-lint, py38-readme, py38-pytest, py38-tutorials [gh-actions] python = - 3.7: py37, test-devel - 3.8: py38 + 3.11: py311-lint, py311-readme, py311-pytest, py311-tutorials + 3.10: py310-lint, py310-readme, py310-pytest, py310-tutorials + 3.9: py39-lint, py39-readme, py39-pytest, py39-tutorials + 3.8: py38-lint, py38-readme, py38-pytest, py38-tutorials [testenv] passenv = CI TRAVIS TRAVIS_* @@ -23,3 +27,4 @@ commands = extras = dev commands = /usr/bin/env make test-devel + \ No newline at end of file