PR #816 + more changes to get tests working

Author: nicfit

CONTRIBUTING.rst

@@ -63,13 +63,14 @@ local development.
 2. Clone your fork locally::
 
     $ git clone git@github.com:your_name_here/MishMash.git
+    $ cd MishMash/
 
 3. Install your local copy into a virtualenv. Assuming you have
    virtualenvwrapper installed, this is how you set up your fork for local
    development::
 
     $ mkvirtualenv mishmash
-    $ cd mishmash/
+    $ pip install -r requirements.txt
     $ python setup.py develop
 
 4. Create a branch for local development::

requirements.txt

@@ -1,29 +1,29 @@
 #
-# This file is autogenerated by pip-compile
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.12
+# by the following command:
 #
 #    pip-compile --output-file=./requirements.txt requirements.txt
 #
 alembic==1.14.1
     # via -r requirements.txt
-attrs==25.1.0
-    # via nicfit.py
+attrs==25.3.0
+    # via nicfit-py
 chameleon==4.6.0
     # via pyramid-chameleon
-coverage[toml]==7.6.12
-    # via eyed3
 deprecation==2.1.0
     # via
     #   eyed3
-    #   nicfit.py
-eyed3==0.9.7
+    #   nicfit-py
+eyed3==0.9.8
     # via -r requirements.txt
 filetype==1.2.0
     # via eyed3
 gevent==24.11.1
     # via -r requirements.txt
-greenlet==3.1.1
-    # via gevent
+greenlet==3.2.2
+    # via
+    #   gevent
+    #   sqlalchemy
 gunicorn==23.0.0
     # via -r requirements.txt
 hupper==1.12.1
@@ -32,34 +32,43 @@ inotify==0.2.10
     # via -r requirements.txt
 iso3166==2.1.1
     # via -r requirements.txt
-mako==1.3.9
+mako==1.3.10
     # via
     #   alembic
     #   pyramid-mako
 markupsafe==3.0.2
     # via mako
-nicfit.py==0.8.7
+nicfit-py==0.8.7
     # via -r requirements.txt
 nose==1.3.7
     # via inotify
-packaging==24.2
-    # via deprecation
-pastedeploy==2.1.1
+packaging==25.0
+    # via
+    #   deprecation
+    #   gunicorn
+    #   zope-sqlalchemy
+pastedeploy==3.1.0
     # via plaster-pastedeploy
-plaster-pastedeploy==1.0.1
-    # via pyramid
 plaster==1.1.2
     # via
     #   plaster-pastedeploy
     #   pyramid
+plaster-pastedeploy==1.0.1
+    # via pyramid
 psycopg2-binary==2.9.10
     # via -r requirements.txt
 pyfiglet==1.0.0rc1
     # via -r requirements.txt
 pygments==2.19.1
     # via pyramid-debugtoolbar
-pyparsing==3.2.1
-    # via packaging
+pyramid==2.0.2
+    # via
+    #   -r requirements.txt
+    #   pyramid-chameleon
+    #   pyramid-debugtoolbar
+    #   pyramid-layout
+    #   pyramid-mako
+    #   pyramid-tm
 pyramid-chameleon==0.3
     # via -r requirements.txt
 pyramid-debugtoolbar==4.12.1
@@ -70,57 +79,44 @@ pyramid-mako==1.1.0
     # via pyramid-debugtoolbar
 pyramid-tm==2.6
     # via -r requirements.txt
-pyramid==2.0.2
-    # via
-    #   -r requirements.txt
-    #   pyramid-chameleon
-    #   pyramid-debugtoolbar
-    #   pyramid-layout
-    #   pyramid-mako
-    #   pyramid-tm
-python-dateutil==2.9.0
-    # via alembic
-python-editor==1.0.4
-    # via alembic
 pyyaml==6.0.2
-    # via nicfit.py
-repoze.lru==0.7
-    # via pyramid-debugtoolbar
-six==1.17.0
-    # via
-    #   python-dateutil
-    #   sqlalchemy-utils
-sqlalchemy-utils==0.41.2
-    # via -r requirements.txt
-sqlalchemy==2.0.38
+    # via nicfit-py
+sqlalchemy==2.0.41
     # via
     #   -r requirements.txt
     #   alembic
     #   sqlalchemy-utils
-    #   zope.sqlalchemy
-toml==0.10.2
-    # via coverage
+    #   zope-sqlalchemy
+sqlalchemy-utils==0.41.2
+    # via -r requirements.txt
 transaction==5.0
     # via
     #   -r requirements.txt
     #   pyramid-tm
-    #   zope.sqlalchemy
+    #   zope-sqlalchemy
 translationstring==1.4
     # via pyramid
+typing-extensions==4.13.2
+    # via
+    #   alembic
+    #   sqlalchemy
 venusian==3.1.1
     # via pyramid
 waitress==3.0.2
     # via -r requirements.txt
 webob==1.8.9
     # via pyramid
-zope.deprecation==5.1
+zope-deprecation==5.1
     # via pyramid
-zope.interface==7.2
+zope-event==5.0
+    # via gevent
+zope-interface==7.2
     # via
+    #   gevent
     #   pyramid
     #   transaction
-    #   zope.sqlalchemy
-zope.sqlalchemy==3.1
+    #   zope-sqlalchemy
+zope-sqlalchemy==3.1
     # via -r requirements.txt
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/dev.txt

@@ -2,7 +2,6 @@ Sphinx
 babel
 check-manifest
 flake8
-git+https://github.com/nicfit/gitchangelog.git@nicfit.py
 nicfit.py[cookiecutter]
 pip-tools
 pss

requirements/requirements.yml

@@ -26,7 +26,6 @@ test:
     - pytest
     - pytest-cov
     - pytest-runner
-    #- git+https://github.com/nicfit/pytest-postgres.git
     - faker
     - factory-boy
 
@@ -37,7 +36,6 @@ dev:
     - babel
     - check-manifest
     - flake8
-    - git+https://github.com/nicfit/gitchangelog.git@nicfit.py
     - pip-tools
     - twine
     - wheel

tox.ini

@@ -1,10 +1,10 @@
 [tox]
-envlist = py{37,38}-postgres{12,11,10}
+envlist = py{312}-postgres{12,11,10}
 skip_missing_interpreters = true
 ignore_basepython_conflict = true
 
 [default]
-python = python3.7
+python = python3.12
 postgresql = 11-alpine
 
 [testenv:default]