Merge branch 'rc-0.1.6'

ifsm · Oct 17, 2024 · 759fa5c · 759fa5c
2 parents 8346a6d + 693df03
commit 759fa5c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
     types: [published]
 
 jobs:
-  build-linux:
+  build-source-dist:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
@@ -14,7 +14,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: "3.13"
 
       - name: Install dependencies
         run: |
@@ -34,7 +34,7 @@ jobs:
   build-macos:
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: macos-latest
     steps:
       - name: Checkout repo
@@ -63,7 +63,7 @@ jobs:
   build-windows:
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     runs-on: windows-latest
     steps:
       - name: Checkout repo
@@ -90,7 +90,7 @@ jobs:
 
   pypi-publish:
     name: Upload releases to PyPI
-    needs: [build-windows, build-macos, build-linux]
+    needs: [build-windows, build-macos, build-source-dist]
     runs-on: ubuntu-latest
     environment:
       name: pypi

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,6 +13,8 @@ jobs:
             3.9
             3.10
             3.11
+            3.12
+            3.13
       - run: python3 -m pip install --user pipx
       - run: python3 -m pipx ensurepath
       - run: pipx install tox

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "apollon"
-version = "0.1.5"
+version = "0.1.6"
 description = "Feature extraction frame work for content-based music analysis"
 authors = [ {name="Michael Blaß", email="[email protected]"} ]
 license = { file="LICENSE.txt" }
@@ -9,11 +9,11 @@ keywords = ["music", "analysis", "feature extraction"]
 classifiers = [
 	"License :: OSI Approved :: BSD License",
 	"Programming Language :: Python :: 3",
-	"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",
+	"Programming Language :: Python :: 3.12",
+	"Programming Language :: Python :: 3.13",
 	"Programming Language :: Python :: 3 :: Only",
 	"Programming Language :: Python :: Implementation :: CPython",
 	"Topic :: Scientific/Engineering",
@@ -22,7 +22,7 @@ classifiers = [
 	"Intended Audience :: Information Technology",
 	"License :: OSI Approved :: BSD License",
 ]
-requires-python = ">=3.7"
+requires-python = ">=3.9"
 dependencies = [
 	"numpy >= 1.20",
 	"jsonschema >= 3.2.0",

diff --git a/src/apollon/__init__.py b/src/apollon/__init__.py
@@ -7,9 +7,8 @@
 """
 
 import os as _os
-import pkg_resources as _pkg
+from importlib.metadata import version as _version
 
-
-__version__ = _pkg.get_distribution('apollon').version
+__version__ = _version("apollon")
 
 APOLLON_PATH = _os.path.dirname(_os.path.realpath(__file__))
diff --git a/tox.ini b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 requires = numpy >= 1.20
-envlist = py38,py39,py311
+envlist = py39,py310,py311,py312,py313
 
 [testenv]
 deps =
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,8 @@ jobs: @@
 .9
 .10
 .11
+.12
+.13
           - run: python3 -m pip install --user pipx
           - run: python3 -m pipx ensurepath
           - run: pipx install tox
@@ Expand Down @@