Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
os: [ubuntu-20.04, macos-latest]
steps:
- uses: actions/checkout@v1
Expand All @@ -49,7 +49,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11']
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
os: [ubuntu-20.04, macos-latest]
steps:
- uses: actions/checkout@v1
Expand Down
11 changes: 6 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
history = history_file.read()

install_requires = [
'Keras>=2.4,<2.15',
'Keras>=2.4',
'featuretools>=0.6.1,<0.23',
'iso639>=0.1.4,<0.2',
'langdetect>=1.0.7,<2',
Expand All @@ -21,13 +21,13 @@
'nltk>=3.3,<4',
'numpy>=1.16.0,<2',
'opencv-python>=3.4.0.12,<4.7',
'pandas>=1,<2',
'pandas>=1,<3',
'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.15',
'tensorflow>=2,<2.15',
'tensorflow>=2,<2.20',
'xgboost>=0.72.1,<2',
'protobuf<4',
]
Expand All @@ -47,7 +47,7 @@
# general
'bumpversion>=0.5.3,<0.6',
'pip>=9.0.1',
'watchdog>=0.8.3,<0.11',
'watchdog>=0.8.3,<5',

# docs
'm2r>=0.2.0,<0.3',
Expand Down Expand Up @@ -103,6 +103,7 @@
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
],
description='Pipelines and primitives for machine learning and data science.',
entry_points = {
Expand All @@ -126,7 +127,7 @@
long_description_content_type='text/markdown',
name='mlprimitives',
packages=find_packages(include=['mlprimitives', 'mlprimitives.*']),
python_requires='>=3.8,<3.12',
python_requires='>=3.8,<3.13',
setup_requires=setup_requires,
test_suite='tests',
tests_require=tests_require,
Expand Down
6 changes: 3 additions & 3 deletions tests/custom/test_feature_extraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class FE(FeatureExtractor):
fe.fit(X)

assert fe._features == ['b']
assert fe._detect_features.not_called()
fe._detect_features.assert_not_called()

def test_fit_auto_pandas(self):
class FE(FeatureExtractor):
Expand All @@ -52,7 +52,7 @@ class FE(FeatureExtractor):
fe.fit(X)

assert fe._features == ['a', 'b']
assert fe._detect_features.called_once_with(X)
fe._detect_features.assert_called_once_with(X)
expected_calls = [
((pd.Series(['a', 'b', 'c']), ), {}),
((pd.Series(['d', 'e', 'f']), ), {})
Expand All @@ -74,7 +74,7 @@ class FE(FeatureExtractor):
fe.fit(X)

assert fe._features == [0, 1]
assert fe._detect_features.called_once_with(X)
assert fe._detect_features.called
expected_calls = [
((pd.Series(['a', 'b', 'c']), ), {}),
((pd.Series(['d', 'e', 'f']), ), {})
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
[tox]
envlist = py3{8,9,10,11}, test-devel
envlist = py3{8,9,10,11,12}, test-devel

[travis]
python =
3.8: py38, test-devel
3.9: py39
3.10: py310
3.11: py311
3.12: py312

[gh-actions]
python =
3.8: py38, test-devel
3.9: py39
3.10: py310
3.11: py311
3.12: py312

[testenv]
passenv = CI TRAVIS TRAVIS_*
Expand Down
Loading