Support Python 3.12 (#386)

.github/workflows/end_to_end.yml

@@ -10,7 +10,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-latest, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1

.github/workflows/minimum.yml

@@ -10,7 +10,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-latest, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1

.github/workflows/numerical.yml

@@ -10,7 +10,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-latest, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1

.github/workflows/readme.yml

@@ -10,7 +10,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-latest, macos-latest]
     steps:
     - uses: actions/checkout@v1

.github/workflows/tutorials.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/unit.yml

@@ -10,7 +10,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-latest, macos-latest, windows-latest]
     steps:
     - uses: actions/checkout@v1

copulas/__init__.py

@@ -11,11 +11,11 @@
 import sys
 import warnings
 from copy import deepcopy
+from importlib.metadata import entry_points
 from operator import attrgetter
 
 import numpy as np
 import pandas as pd
-from pkg_resources import iter_entry_points
 
 EPSILON = np.finfo(np.float32).eps
 
@@ -311,7 +311,13 @@ def _get_addon_target(addon_path_name):
 def _find_addons():
     """Find and load all copulas add-ons."""
     group = 'copulas_modules'
-    for entry_point in iter_entry_points(group=group):
+    try:
+        eps = entry_points(group=group)
+    except TypeError:
+        # Load-time selection requires Python >= 3.10 or importlib_metadata >= 3.6
+        eps = entry_points().get(group, [])
+
+    for entry_point in eps:
         try:
             addon = entry_point.load()
         except Exception:  # pylint: disable=broad-exception-caught

pyproject.toml

@@ -12,22 +12,25 @@ classifiers = [
     'Programming Language :: Python :: 3.9',
     'Programming Language :: Python :: 3.10',
     'Programming Language :: Python :: 3.11',
+    'Programming Language :: Python :: 3.12',
     'Topic :: Scientific/Engineering :: Artificial Intelligence',
 ]
 keywords = [ 'copulas' ]
 dynamic = ["version"]
 license = { text = 'BSL-1.1' }
-requires-python = '>=3.8,<3.12'
+requires-python = '>=3.8,<3.13'
 readme = 'README.md'
 dependencies = [
     "numpy>=1.20.0,<2;python_version<'3.10'",
-    "numpy>=1.23.3,<2;python_version>='3.10'",
+    "numpy>=1.23.3,<2;python_version>='3.10' and python_version<'3.12'",
+    "numpy>=1.26.0,<2;python_version>='3.12'",
     "pandas>=1.1.3;python_version<'3.10'",
     "pandas>=1.3.4;python_version>='3.10' and python_version<'3.11'",
     "pandas>=1.5.0;python_version>='3.11'",
     'plotly>=5.10.0,<6',
     "scipy>=1.5.4,<2;python_version<'3.10'",
-    "scipy>=1.9.2,<2;python_version>='3.10'",
+    "scipy>=1.9.2,<2;python_version>='3.10' and python_version<'3.12'",
+    "scipy>=1.12.0,<2;python_version>='3.12'",
 ]
 
 [project.urls]
@@ -47,14 +50,15 @@ version = {attr = 'copulas.__version__'}
 [project.optional-dependencies]
 tutorials = [
     'markupsafe<=2.0.1',
-    'scikit-learn>=0.24,<1.2',
+    "scikit-learn>=0.24,<1.2;python_version<'3.10'",
+    "scikit-learn>=0.24,<1.5;python_version>='3.10'",
     'jupyter>=1.0.0,<2',
 ]
 test = [
     'copulas[tutorials]',
     'pytest>=6.2.5,<7',
     'pytest-cov>=2.6.0,<3',
-    'pytest-rerunfailures>=9.0.0,<10',
+    'pytest-rerunfailures>=10.3,<15',
     'rundoc>=0.4.3,<0.5',
     'tomli>=2.0.0,<3',
 ]
@@ -65,7 +69,7 @@ dev = [
     'pip>=9.0.1',
     'build>=1.0.0,<2',
     'bump-my-version>=0.18.3,<1',
-    'watchdog>=0.8.3,<0.11',
+    'watchdog>=1.0.1,<5',
 
     # docs
     'm2r>=0.2.0,<0.3',
@@ -164,7 +168,6 @@ namespaces = false
     '*.png',
     '*.gif'
 ]
-'tests' = ['*']
 
 [tool.setuptools.exclude-package-data]
 '*' = [

tests/unit/bivariate/test_base.py

@@ -80,7 +80,7 @@ def test_save(self, json_mock, open_mock):
         instance.save('test.json')
 
         # Check
-        assert open_mock.called_once_with('test.json', 'w')
+        open_mock.assert_called_once_with('test.json', 'w')
         assert json_mock.called
         compare_nested_dicts(json_mock.call_args[0][0], expected_content)
 
@@ -99,10 +99,10 @@ def test_load_from_file(self, json_mock, open_mock):
         instance = Bivariate.load('somefile.json')
 
         # Check
-        assert open_mock.called_once_with('test.json', 'r')
-        instance.copula_type == CopulaTypes.FRANK
-        instance.tau == -0.33333333333333337
-        instance.theta == -3.305771759329249
+        open_mock.assert_called_once_with('somefile.json')
+        assert instance.copula_type == CopulaTypes.FRANK
+        assert instance.tau == -0.33333333333333337
+        assert instance.theta == -3.305771759329249
 
     @mock.patch('copulas.bivariate.clayton.Clayton.partial_derivative')
     def test_partial_derivative_scalar(self, derivative_mock):

tests/unit/multivariate/test_gaussian.py

@@ -392,11 +392,15 @@ def test_sample(self, normal_mock):
         # Check
         assert result.equals(expected_result)
 
-        assert normal_mock.called_once_with(
-            np.zeros(instance.correlation.shape[0]),
-            instance.correlation,
-            5
+        np.testing.assert_array_equal(
+            normal_mock.call_args[0][0],
+            np.zeros(instance.correlation.shape[0])
         )
+        np.testing.assert_array_equal(
+            normal_mock.call_args[0][1],
+            instance.correlation
+        )
+        assert normal_mock.call_args[1] == {'size': 5}
 
     def test_sample_random_state(self):
         """When random_state is set the samples are the same."""

tests/unit/test___init__.py

@@ -435,7 +435,7 @@ def mock_copulas():
     sys.modules['copulas'] = copulas_module
 
 
-@patch.object(copulas, 'iter_entry_points')
+@patch.object(copulas, 'entry_points')
 def test__find_addons_module(entry_points_mock, mock_copulas):
     """Test loading an add-on."""
     # Setup
@@ -452,7 +452,7 @@ def test__find_addons_module(entry_points_mock, mock_copulas):
     assert mock_copulas.submodule.entry_name == 'entry_point'
 
 
-@patch.object(copulas, 'iter_entry_points')
+@patch.object(copulas, 'entry_points')
 def test__find_addons_object(entry_points_mock, mock_copulas):
     """Test loading an add-on."""
     # Setup
@@ -470,7 +470,7 @@ def test__find_addons_object(entry_points_mock, mock_copulas):
 
 
 @patch('warnings.warn')
-@patch('copulas.iter_entry_points')
+@patch('copulas.entry_points')
 def test__find_addons_bad_addon(entry_points_mock, warning_mock):
     """Test failing to load an add-on generates a warning."""
     # Setup
@@ -493,7 +493,7 @@ def entry_point_error():
 
 
 @patch('warnings.warn')
-@patch('copulas.iter_entry_points')
+@patch('copulas.entry_points')
 def test__find_addons_wrong_base(entry_points_mock, warning_mock):
     """Test incorrect add-on name generates a warning."""
     # Setup
@@ -514,7 +514,7 @@ def test__find_addons_wrong_base(entry_points_mock, warning_mock):
 
 
 @patch('warnings.warn')
-@patch('copulas.iter_entry_points')
+@patch('copulas.entry_points')
 def test__find_addons_missing_submodule(entry_points_mock, warning_mock):
     """Test incorrect add-on name generates a warning."""
     # Setup
@@ -535,7 +535,7 @@ def test__find_addons_missing_submodule(entry_points_mock, warning_mock):
 
 
 @patch('warnings.warn')
-@patch('copulas.iter_entry_points')
+@patch('copulas.entry_points')
 def test__find_addons_module_and_object(entry_points_mock, warning_mock):
     """Test incorrect add-on name generates a warning."""
     # Setup
@@ -556,7 +556,7 @@ def test__find_addons_module_and_object(entry_points_mock, warning_mock):
 
 
 @patch('warnings.warn')
-@patch.object(copulas, 'iter_entry_points')
+@patch.object(copulas, 'entry_points')
 def test__find_addons_missing_object(entry_points_mock, warning_mock, mock_copulas):
     """Test incorrect add-on name generates a warning."""
     # Setup

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py39-lint, py3{8,9,10,11}-{readme,unit,end_to_end,numerical,minimum,tutorials}
+envlist = py39-lint, py3{8,9,10,11,12}-{readme,unit,end_to_end,numerical,minimum,tutorials}
 
 [testenv]
 skipsdist = false