Integrate Via's new DB with Pyramid and pytest

hypothesis · Jul 25, 2023 · 35c1239 · 35c1239
1 parent 23e60ed
commit 35c1239
Show file tree

Hide file tree

Showing 18 changed files with 278 additions and 28 deletions.
diff --git a/.cookiecutter/includes/coverage/omit b/.cookiecutter/includes/coverage/omit
@@ -0,0 +1 @@
+"via/pshell.py",
diff --git a/.cookiecutter/includes/requirements/prod.in b/.cookiecutter/includes/requirements/prod.in
@@ -8,9 +8,11 @@ pyramid-exclog
 pyramid-jinja2
 pyramid-sanity
 pyramid-services
+pyramid-tm
 requests
 whitenoise
 google-auth-oauthlib
 marshmallow
 webargs
 youtube-transcript-api
+zope.sqlalchemy
diff --git a/pyproject.toml b/pyproject.toml
@@ -42,6 +42,7 @@ parallel = true
 source = ["via", "tests/unit"]
 omit = [
     "*/via/__main__.py",
+    "via/pshell.py",
 ]
 
 [tool.coverage.paths]

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -136,6 +136,7 @@ packaging==21.3
     #   build
     #   marshmallow
     #   webargs
+    #   zope-sqlalchemy
 parso==0.8.2
     # via jedi
 pastedeploy==2.1.1
@@ -203,6 +204,7 @@ pyramid==2.0
     #   pyramid-jinja2
     #   pyramid-sanity
     #   pyramid-services
+    #   pyramid-tm
 pyramid-exclog==1.1
     # via -r prod.txt
 pyramid-ipython==0.2
@@ -213,6 +215,8 @@ pyramid-sanity==1.0.3
     # via -r prod.txt
 pyramid-services==2.2
     # via -r prod.txt
+pyramid-tm==2.5
+    # via -r prod.txt
 pyrsistent==0.17.3
     # via
     #   -r prod.txt
@@ -253,6 +257,7 @@ sqlalchemy==2.0.19
     # via
     #   -r prod.txt
     #   alembic
+    #   zope-sqlalchemy
 stack-data==0.6.2
     # via ipython
 supervisor==4.2.5
@@ -266,6 +271,11 @@ traitlets==5.0.5
     # via
     #   ipython
     #   matplotlib-inline
+transaction==3.1.0
+    # via
+    #   -r prod.txt
+    #   pyramid-tm
+    #   zope-sqlalchemy
 translationstring==1.4
     # via
     #   -r prod.txt
@@ -318,7 +328,11 @@ zope-interface==5.2.0
     #   -r prod.txt
     #   pyramid
     #   pyramid-services
+    #   transaction
     #   wired
+    #   zope-sqlalchemy
+zope-sqlalchemy==3.0
+    # via -r prod.txt
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==23.1.2
@@ -335,3 +349,4 @@ setuptools==67.7.2
     #   supervisor
     #   zope-deprecation
     #   zope-interface
+    #   zope-sqlalchemy
diff --git a/requirements/functests.txt b/requirements/functests.txt
@@ -135,6 +135,7 @@ packaging==21.3
     #   marshmallow
     #   pytest
     #   webargs
+    #   zope-sqlalchemy
 pastedeploy==2.1.1
     # via
     #   -r prod.txt
@@ -189,6 +190,7 @@ pyramid==2.0
     #   pyramid-jinja2
     #   pyramid-sanity
     #   pyramid-services
+    #   pyramid-tm
 pyramid-exclog==1.1
     # via -r prod.txt
 pyramid-jinja2==2.10
@@ -197,6 +199,8 @@ pyramid-sanity==1.0.3
     # via -r prod.txt
 pyramid-services==2.2
     # via -r prod.txt
+pyramid-tm==2.5
+    # via -r prod.txt
 pyrsistent==0.17.3
     # via
     #   -r prod.txt
@@ -245,12 +249,18 @@ sqlalchemy==2.0.19
     # via
     #   -r prod.txt
     #   alembic
+    #   zope-sqlalchemy
 tomli==2.0.0
     # via
     #   build
     #   pep517
     #   pip-tools
     #   pytest
+transaction==3.1.0
+    # via
+    #   -r prod.txt
+    #   pyramid-tm
+    #   zope-sqlalchemy
 translationstring==1.4
     # via
     #   -r prod.txt
@@ -307,7 +317,11 @@ zope-interface==5.2.0
     #   -r prod.txt
     #   pyramid
     #   pyramid-services
+    #   transaction
     #   wired
+    #   zope-sqlalchemy
+zope-sqlalchemy==3.0
+    # via -r prod.txt
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==23.1.2
@@ -323,3 +337,4 @@ setuptools==67.7.2
     #   pyramid
     #   zope-deprecation
     #   zope-interface
+    #   zope-sqlalchemy
diff --git a/requirements/lint.txt b/requirements/lint.txt
@@ -211,6 +211,7 @@ packaging==21.3
     #   marshmallow
     #   pytest
     #   webargs
+    #   zope-sqlalchemy
 pastedeploy==2.1.1
     # via
     #   -r functests.txt
@@ -296,6 +297,7 @@ pyramid==2.0
     #   pyramid-jinja2
     #   pyramid-sanity
     #   pyramid-services
+    #   pyramid-tm
 pyramid-exclog==1.1
     # via
     #   -r functests.txt
@@ -312,6 +314,10 @@ pyramid-services==2.2
     # via
     #   -r functests.txt
     #   -r tests.txt
+pyramid-tm==2.5
+    # via
+    #   -r functests.txt
+    #   -r tests.txt
 pyrsistent==0.17.3
     # via
     #   -r functests.txt
@@ -379,6 +385,7 @@ sqlalchemy==2.0.19
     #   -r functests.txt
     #   -r tests.txt
     #   alembic
+    #   zope-sqlalchemy
 toml==0.10.2
     # via -r lint.in
 tomli==2.0.0
@@ -393,6 +400,12 @@ tomli==2.0.0
     #   pytest
 tomlkit==0.11.0
     # via pylint
+transaction==3.1.0
+    # via
+    #   -r functests.txt
+    #   -r tests.txt
+    #   pyramid-tm
+    #   zope-sqlalchemy
 translationstring==1.4
     # via
     #   -r functests.txt
@@ -473,7 +486,13 @@ zope-interface==5.2.0
     #   -r tests.txt
     #   pyramid
     #   pyramid-services
+    #   transaction
     #   wired
+    #   zope-sqlalchemy
+zope-sqlalchemy==3.0
+    # via
+    #   -r functests.txt
+    #   -r tests.txt
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==23.1.2
@@ -493,3 +512,4 @@ setuptools==67.7.2
     #   pyramid
     #   zope-deprecation
     #   zope-interface
+    #   zope-sqlalchemy
diff --git a/requirements/prod.in b/requirements/prod.in
@@ -14,9 +14,11 @@ pyramid-exclog
 pyramid-jinja2
 pyramid-sanity
 pyramid-services
+pyramid-tm
 requests
 whitenoise
 google-auth-oauthlib
 marshmallow
 webargs
 youtube-transcript-api
+zope.sqlalchemy
diff --git a/requirements/prod.txt b/requirements/prod.txt
@@ -76,6 +76,7 @@ packaging==21.3
     # via
     #   marshmallow
     #   webargs
+    #   zope-sqlalchemy
 pastedeploy==2.1.1
     # via plaster-pastedeploy
 plaster==1.0
@@ -108,6 +109,7 @@ pyramid==2.0
     #   pyramid-jinja2
     #   pyramid-sanity
     #   pyramid-services
+    #   pyramid-tm
 pyramid-exclog==1.1
     # via -r prod.in
 pyramid-jinja2==2.10
@@ -116,6 +118,8 @@ pyramid-sanity==1.0.3
     # via -r prod.in
 pyramid-services==2.2
     # via -r prod.in
+pyramid-tm==2.5
+    # via -r prod.in
 pyrsistent==0.17.3
     # via jsonschema
 python-jose[cryptography]==3.3.0
@@ -143,6 +147,11 @@ sqlalchemy==2.0.19
     # via
     #   -r prod.in
     #   alembic
+    #   zope-sqlalchemy
+transaction==3.1.0
+    # via
+    #   pyramid-tm
+    #   zope-sqlalchemy
 translationstring==1.4
     # via pyramid
 typing-extensions==4.7.1
@@ -179,7 +188,11 @@ zope-interface==5.2.0
     # via
     #   pyramid
     #   pyramid-services
+    #   transaction
     #   wired
+    #   zope-sqlalchemy
+zope-sqlalchemy==3.0
+    # via -r prod.in
 
 # The following packages are considered to be unsafe in a requirements file:
 setuptools==67.7.2
@@ -191,3 +204,4 @@ setuptools==67.7.2
     #   pyramid
     #   zope-deprecation
     #   zope-interface
+    #   zope-sqlalchemy
diff --git a/requirements/tests.txt b/requirements/tests.txt
@@ -137,6 +137,7 @@ packaging==21.3
     #   marshmallow
     #   pytest
     #   webargs
+    #   zope-sqlalchemy
 pastedeploy==2.1.1
     # via
     #   -r prod.txt
@@ -191,6 +192,7 @@ pyramid==2.0
     #   pyramid-jinja2
     #   pyramid-sanity
     #   pyramid-services
+    #   pyramid-tm
 pyramid-exclog==1.1
     # via -r prod.txt
 pyramid-jinja2==2.10
@@ -199,6 +201,8 @@ pyramid-sanity==1.0.3
     # via -r prod.txt
 pyramid-services==2.2
     # via -r prod.txt
+pyramid-tm==2.5
+    # via -r prod.txt
 pyrsistent==0.17.3
     # via
     #   -r prod.txt
@@ -247,13 +251,19 @@ sqlalchemy==2.0.19
     # via
     #   -r prod.txt
     #   alembic
+    #   zope-sqlalchemy
 tomli==2.0.0
     # via
     #   build
     #   coverage
     #   pep517
     #   pip-tools
     #   pytest
+transaction==3.1.0
+    # via
+    #   -r prod.txt
+    #   pyramid-tm
+    #   zope-sqlalchemy
 translationstring==1.4
     # via
     #   -r prod.txt
@@ -305,7 +315,11 @@ zope-interface==5.2.0
     #   -r prod.txt
     #   pyramid
     #   pyramid-services
+    #   transaction
     #   wired
+    #   zope-sqlalchemy
+zope-sqlalchemy==3.0
+    # via -r prod.txt
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==23.1.2
@@ -321,3 +335,4 @@ setuptools==67.7.2
     #   pyramid
     #   zope-deprecation
     #   zope-interface
+    #   zope-sqlalchemy