feat(updates): now run on python 3.13

Author: Mte90

.gitignore

@@ -68,6 +68,7 @@ instance/
 
 # Sphinx documentation
 docs/_build/
+mishmash.db
 
 # PyBuilder
 target/

mishmash/commands/sync/sync.py

@@ -18,6 +18,10 @@
 from eyed3.core import TXXX_ALBUM_TYPE, VARIOUS_TYPE, LP_TYPE, SINGLE_TYPE, EP_TYPE
 from nicfit.console.ansi import Fg
 from nicfit.console import pout, perr
+import warnings
+
+warnings.filterwarnings("ignore", module="eyed3")
+
 
 from ...util import normalizeCountry
 from ...orm import (Track, Artist, Album, Meta, Image, Library,

mishmash/database.py

@@ -16,7 +16,7 @@
 from .orm import Artist, Track, Album, Tag
 from .util import safeDbUrl
 
-DEFAULT_ENGINE_ARGS = {"encoding": "utf8",
+DEFAULT_ENGINE_ARGS = {
                        "echo": False,
                       }
 DEFAULT_SESSION_ARGS = {

mishmash/orm/core.py

@@ -12,7 +12,10 @@
 from sqlalchemy.types import TypeDecorator
 from sqlalchemy import orm, event, types, Sequence
 from sqlalchemy.ext.declarative import declarative_base
+import warnings
+from sqlalchemy.exc import SAWarning
 
+warnings.filterwarnings("ignore", category=SAWarning)
 import eyed3
 from eyed3.utils import art
 from eyed3.utils import guessMimetype
@@ -156,15 +159,15 @@ class Artist(Base, OrmObject):
                         nullable=False, index=True)
 
     # Relations
-    albums = orm.relation("Album", cascade="all")
+    albums = orm.relationship("Album", cascade="all")
     """all albums by the artist"""
-    tracks = orm.relation("Track", cascade="all")
+    tracks = orm.relationship("Track", cascade="all")
     """all tracks by the artist"""
-    tags = orm.relation("Tag", secondary=artist_tags)
+    tags = orm.relationship("Tag", secondary=artist_tags)
     """one-to-many (artist->tag) and many-to-one (tag->artist)"""
-    images = orm.relation("Image", secondary=artist_images, cascade="all")
+    images = orm.relationship("Image", secondary=artist_images, cascade="all")
     """one-to-many artist images."""
-    library = orm.relation("Library")
+    library = orm.relationship("Library")
 
     def getAlbumsByType(self, album_type):
         if album_type == VARIOUS_TYPE:
@@ -287,13 +290,13 @@ class Album(Base, OrmObject):
                         nullable=False, index=True)
 
     # Relations
-    artist = orm.relation("Artist")
-    tracks = orm.relation("Track", order_by="Track.track_num",
+    artist = orm.relationship("Artist")
+    tracks = orm.relationship("Track", order_by="Track.track_num",
                           cascade="all")
-    tags = orm.relation("Tag", secondary=album_tags)
-    images = orm.relation("Image", secondary=album_images, cascade="all")
+    tags = orm.relationship("Tag", secondary=album_tags)
+    images = orm.relationship("Image", secondary=album_images, cascade="all")
     """one-to-many album images."""
-    library = orm.relation("Library")
+    library = orm.relationship("Library")
 
     def getBestDate(self):
         from eyed3.utils import datePicker
@@ -349,10 +352,10 @@ class Track(Base, OrmObject):
                         nullable=False, index=True)
 
     # Relations
-    artist = orm.relation("Artist")
-    album = orm.relation("Album")
-    tags = orm.relation("Tag", secondary=track_tags)
-    library = orm.relation("Library")
+    artist = orm.relationship("Artist")
+    album = orm.relationship("Album")
+    tags = orm.relationship("Tag", secondary=track_tags)
+    library = orm.relationship("Library")
 
     # XXX: test-only
     _mp3_file = None
@@ -419,7 +422,7 @@ class Tag(Base, OrmObject):
                         nullable=False, index=True)
 
     # Relations
-    library = orm.relation("Library")
+    library = orm.relationship("Library")
 
     @orm.validates("name")
     def _truncateName(self, key, value):

mishmash/web/__init__.py

@@ -25,13 +25,13 @@ def _DBSession(request):
 
         config.add_route('all_artists', '/artists')
         config.add_route('all_albums', '/albums')
-        config.add_route('artist', '/artist/{id:\d+}')  # noqa: W605
-        config.add_route('images.covers', '/images/covers/{id:\d+|default}')  # noqa: W605
-        config.add_route('images.artist', '/images/artist/{id:\d+|default}')  # noqa: W605
+        config.add_route('artist', '/artist/{id:+}')  # noqa: W605
+        config.add_route('images.covers', '/images/covers/{id:+|default}')  # noqa: W605
+        config.add_route('images.artist', '/images/artist/{id:+|default}')  # noqa: W605
         config.add_route('home', '/')
         config.add_route('search', '/search')
         config.add_route('new_music', '/new')
-        config.add_route('album', '/album/{id:\d+}')  # noqa: W605
+        config.add_route('album', '/album/{id:+}')  # noqa: W605
 
         config.scan(".panels")
         config.scan(".layouts")

requirements.txt

@@ -4,123 +4,123 @@
 #
 #    pip-compile --output-file=./requirements.txt requirements.txt
 #
-alembic==1.4.0
+alembic==1.14.1
     # via -r requirements.txt
-attrs==20.3.0
+attrs==25.1.0
     # via nicfit.py
-chameleon==3.9.0
+chameleon==4.6.0
     # via pyramid-chameleon
-coverage[toml]==5.5
+coverage[toml]==7.6.12
     # via eyed3
 deprecation==2.1.0
     # via
     #   eyed3
     #   nicfit.py
-eyed3==0.9.6
+eyed3==0.9.7
     # via -r requirements.txt
-filetype==1.0.7
+filetype==1.2.0
     # via eyed3
-gevent==1.4.0
+gevent==24.11.1
     # via -r requirements.txt
-greenlet==1.0.0
+greenlet==3.1.1
     # via gevent
-gunicorn==20.0.4
+gunicorn==23.0.0
     # via -r requirements.txt
-hupper==1.10.2
+hupper==1.12.1
     # via pyramid
 inotify==0.2.10
     # via -r requirements.txt
-iso3166==1.0.1
+iso3166==2.1.1
     # via -r requirements.txt
-mako==1.1.4
+mako==1.3.9
     # via
     #   alembic
     #   pyramid-mako
-markupsafe==1.1.1
+markupsafe==3.0.2
     # via mako
-nicfit.py==0.8.5
+nicfit.py==0.8.7
     # via -r requirements.txt
 nose==1.3.7
     # via inotify
-packaging==20.9
+packaging==24.2
     # via deprecation
 pastedeploy==2.1.1
     # via plaster-pastedeploy
-plaster-pastedeploy==0.7
+plaster-pastedeploy==1.0.1
     # via pyramid
-plaster==1.0
+plaster==1.1.2
     # via
     #   plaster-pastedeploy
     #   pyramid
-psycopg2-binary==2.8.4
+psycopg2-binary==2.9.10
     # via -r requirements.txt
-pyfiglet==0.8.post1
+pyfiglet==1.0.0rc1
     # via -r requirements.txt
-pygments==2.8.1
+pygments==2.19.1
     # via pyramid-debugtoolbar
-pyparsing==2.4.7
+pyparsing==3.2.1
     # via packaging
 pyramid-chameleon==0.3
     # via -r requirements.txt
-pyramid-debugtoolbar==4.6.1
+pyramid-debugtoolbar==4.12.1
     # via -r requirements.txt
 pyramid-layout==1.0
     # via -r requirements.txt
 pyramid-mako==1.1.0
     # via pyramid-debugtoolbar
-pyramid-tm==2.4
+pyramid-tm==2.6
     # via -r requirements.txt
-pyramid==1.10.4
+pyramid==2.0.2
     # via
     #   -r requirements.txt
     #   pyramid-chameleon
     #   pyramid-debugtoolbar
     #   pyramid-layout
     #   pyramid-mako
     #   pyramid-tm
-python-dateutil==2.8.1
+python-dateutil==2.9.0
     # via alembic
 python-editor==1.0.4
     # via alembic
-pyyaml==5.4.1
+pyyaml==6.0.2
     # via nicfit.py
 repoze.lru==0.7
     # via pyramid-debugtoolbar
-six==1.15.0
+six==1.17.0
     # via
     #   python-dateutil
     #   sqlalchemy-utils
-sqlalchemy-utils==0.36.1
+sqlalchemy-utils==0.41.2
     # via -r requirements.txt
-sqlalchemy==1.3.23
+sqlalchemy==2.0.38
     # via
     #   -r requirements.txt
     #   alembic
     #   sqlalchemy-utils
     #   zope.sqlalchemy
 toml==0.10.2
     # via coverage
-transaction==3.0.0
+transaction==5.0
     # via
     #   -r requirements.txt
     #   pyramid-tm
     #   zope.sqlalchemy
 translationstring==1.4
     # via pyramid
-venusian==3.0.0
+venusian==3.1.1
     # via pyramid
-waitress==1.4.3
+waitress==3.0.2
     # via -r requirements.txt
-webob==1.8.7
+webob==1.8.9
     # via pyramid
-zope.deprecation==4.4.0
+zope.deprecation==5.1
     # via pyramid
-zope.interface==5.2.0
+zope.interface==7.2
     # via
     #   pyramid
     #   transaction
     #   zope.sqlalchemy
-zope.sqlalchemy==1.3
+zope.sqlalchemy==3.1
     # via -r requirements.txt
 
 # The following packages are considered to be unsafe in a requirements file: