Merge remote-tracking branch 'upstream/main'

Author: tsbinns

.pre-commit-config.yaml

@@ -1,7 +1,7 @@
 repos:
   # ruff PyBispectra
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.1
+    rev: v0.9.3
     hooks:
       - id: ruff
         name: ruff lint pybispectra
@@ -10,7 +10,7 @@ repos:
 
   # ruff examples
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.1
+    rev: v0.9.3
     hooks:
       - id: ruff
         name: ruff lint examples
@@ -19,7 +19,7 @@ repos:
 
   # codespell
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.3.0
+    rev: v2.4.0
     hooks:
       - id: codespell
         additional_dependencies:

changelog.md

@@ -1,8 +1,8 @@
 # PyBispectra Changelog
 
-## [Version 1.2.1dev](https://pybispectra.readthedocs.io/en/main/)
+## [Version 1.3dev](https://pybispectra.readthedocs.io/en/main/)
 
-## [Version 1.2.0](https://pybispectra.readthedocs.io/en/1.2.0/)
+## [Version 1.2](https://pybispectra.readthedocs.io/en/1.2.1/)
 
 ##### Enhancements
 - Added general `Bispectrum` and `Threenorm` classes for computing with flexible kmn channel combinations.
@@ -19,7 +19,7 @@
 ##### Documentation
 - Added a new example for computing the bispectrum and threenorm using the general classes.
 
-## [Version 1.1.0](https://pybispectra.readthedocs.io/en/1.1.0/)
+## [Version 1.1](https://pybispectra.readthedocs.io/en/1.1.0/)
 
 ##### Enhancements
 - Reduced the memory requirement of bispectrum computations.
@@ -37,6 +37,6 @@
 - Added a new example for computing time delays on specific frequency bands.
 
 
-## [Version 1.0.0](https://pybispectra.readthedocs.io/en/1.0.0/)
+## [Version 1.0](https://pybispectra.readthedocs.io/en/1.0.0/)
 
 - Initial release.

docs/source/_static/versions.json

@@ -1,13 +1,13 @@
 [
     {
-        "name": "1.2.1dev",
-        "version": "1.2.1dev",
+        "name": "1.3.0dev",
+        "version": "1.3.0dev",
         "url": "https://pybispectra.readthedocs.io/en/main/"
     },
     {
-        "name": "1.2.0",
-        "version": "1.2.0",
-        "url": "https://pybispectra.readthedocs.io/en/1.2.0/"
+        "name": "1.2.1",
+        "version": "1.2.1",
+        "url": "https://pybispectra.readthedocs.io/en/1.2.1/"
     },
     {
         "name": "1.1.0",

docs/source/conf.py

@@ -15,7 +15,7 @@
 project = "PyBispectra"
 copyright = "2023, Thomas S. Binns"
 author = "Thomas S. Binns"
-release = "1.2.1dev"
+release = "1.3.0dev"
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

environment.yml

@@ -8,4 +8,5 @@ dependencies:
   - mne>1.6
   - numba
   - numpy
+  - scikit-learn
   - scipy

pyproject.toml

@@ -9,12 +9,20 @@ classifiers = [
   "Operating System :: OS Independent",
   "Programming Language :: Python :: 3",
 ]
-dependencies = ["joblib", "matplotlib", "mne>1.6", "numba", "numpy", "scipy"]
+dependencies = [
+  "joblib",
+  "matplotlib",
+  "mne>1.6",
+  "numba",
+  "numpy",
+  "scikit-learn",
+  "scipy",
+]
 description = "A Python signal processing package for computing spectral-domain and time-domain interactions using the bispectrum."
 name = "pybispectra"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "1.2.1dev"
+version = "1.3.0dev"
 
 [project.optional-dependencies]
 dev = ["pybispectra[doc]", "pybispectra[lint]", "pybispectra[test]"]