fix merge

Author: TomDonoghue

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       MODULE_NAME: specparam
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
     - uses: actions/checkout@v3

CITATION.cff

@@ -1,36 +1,61 @@
 cff-version: 1.2.0
-message: "If you use this software, please cite it as below."
+message: >-
+  If you use this software, please cite it using the metadata from this file.
+type: software
+title: 'specparam: spectral parameterization'
+authors:
+- given-names: 'Thomas'
+  family-names: 'Donoghue'
+  orcid: 'https://orcid.org/0000-0001-5911-0472'
+- given-names: 'Erik J'
+  family-names: 'Peterson'
+  orcid: 'https://orcid.org/0000-0002-2033-007X'
+- given-names: 'Ryan'
+  family-names: 'Hammonds'
+  orcid: 'https://orcid.org/0000-0002-5032-3241'
+- given-names: 'Richard'
+  family-names: 'Gao'
+  orcid: 'https://orcid.org/0000-0001-5916-6433'
+- given-names: 'Bradley'
+  family-names: 'Voytek'
+  orcid: 'https://orcid.org/0000-0003-1640-2525'
+repository-code: 'https://github.com/fooof-tools/fooof'
+url: 'https://fooof-tools.github.io/'
+license: Apache-2.0
 preferred-citation:
   type: article
   authors:
-  - family-names: "Donoghue"
-    given-names: "Thomas"
-    orcid: "https://orcid.org/0000-0001-5911-0472"
-  - family-names: "Haller"
-    given-names: "Matar"
-  - family-names: "Peterson"
-    given-names: "Erik J"
-  - family-names: "Varma"
-    given-names: "Paroma"
-  - family-names: "Sebastian"
-    given-names: "Priyadarshini"
-  - family-names: "Gao"
-    given-names: "Richard"
-  - family-names: "Noto"
-    given-names: "Torben"
-  - family-names: "Lara"
-    given-names: "Antonio H"
-  - family-names: "Wallis"
-    given-names: "Joni D"
-  - family-names: "Knight"
-    given-names: "Robert T"
-  - family-names: "Shestyuk"
-    given-names: "Avgusta"
-  - family-names: "Voytek"
-    given-names: "Bradley"
-  doi: "10.1038/s41593-020-00744-x"
-  journal: "Nature Neuroscience"
-  title: "Parameterizing neural power spectra into periodic and aperiodic components"
+  - given-names: 'Thomas'
+    family-names: 'Donoghue'
+    orcid: 'https://orcid.org/0000-0001-5911-0472'
+  - given-names: 'Matar'
+    family-names: 'Haller'
+  - given-names: 'Erik J'
+    family-names: 'Peterson'
+    orcid: 'https://orcid.org/0000-0002-2033-007X'
+  - given-names: 'Paroma'
+    family-names: 'Varma'
+  - given-names: 'Priyadarshini'
+    family-names: 'Sebastian'
+  - given-names: 'Richard'
+    family-names: 'Gao'
+    orcid: 'https://orcid.org/0000-0001-5916-6433'
+  - given-names: 'Torben'
+    family-names: 'Noto'
+  - given-names: 'Antonio H'
+    family-names: 'Lara'
+  - given-names: 'Joni D'
+    family-names: 'Wallis'
+  - given-names: 'Robert T'
+    family-names: 'Knight'
+  - given-names: 'Avgusta'
+    family-names: 'Shestyuk'
+  - given-names: 'Bradley'
+    family-names: 'Voytek'
+    orcid: 'https://orcid.org/0000-0003-1640-2525'
+  doi: '10.1038/s41593-020-00744-x'
+  journal: 'Nature Neuroscience'
+  title: 'Parameterizing neural power spectra into periodic and aperiodic components'
   issue: 12
   volume: 23
   year: 2020

Makefile

@@ -64,7 +64,7 @@ tests:
 # Run test coverage
 coverage:
 	@printf "\n\nRUN TESTS: \n"
-	@coverage run --source $(MODULE) -m py.test
+	@coverage run --source $(MODULE) -m pytest
 	@printf "\n\nCHECK COVERAGE: \n"
 	@coverage report --omit="*/tests*"
 

README.rst

@@ -26,7 +26,9 @@ Spectral Parameterization
 .. _Paper: https://doi.org/10.1038/s41593-020-00744-x
 
 
-Spectral parameterization is a fast, efficient, and physiologically-informed tool to parameterize neural power spectra.
+Spectral parameterization (`specparam`, formerly `fooof`) is a fast, efficient, and physiologically-informed tool to parameterize neural power spectra.
+
+WARNING: this Github repository has been updated to a major update / breaking change from the current release of the `fooof` module, and is no longer consistent with the `fooof` version of the code.
 
 Overview
 --------

setup.py

@@ -44,6 +44,7 @@
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ],
     platforms = 'any',
     project_urls = {