From a56d4a02d1a4dff27185e6d441e6d7c46a80a428 Mon Sep 17 00:00:00 2001 From: Deimos Date: Sat, 30 Nov 2019 19:55:24 -0700 Subject: [PATCH] Update pypi package versions (requirements.txt) Required a minor change to how mypy is handling enums now. I'm not a big fan of the result and think it's somewhat incorrect, but the type annotations in that file are a disaster anyway. --- tildes/requirements-dev.txt | 35 +++++++++++++++++------------------ tildes/requirements.txt | 22 +++++++++++----------- tildes/tildes/views/user.py | 4 ++-- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/tildes/requirements-dev.txt b/tildes/requirements-dev.txt index 7103e7e..e8dc6e0 100644 --- a/tildes/requirements-dev.txt +++ b/tildes/requirements-dev.txt @@ -4,13 +4,12 @@ amqpy==0.13.1 appdirs==1.4.3 # via black argon2-cffi==19.2.0 astroid==2.2.5 # via prospector, pylint, pylint-celery, pylint-flask, requirements-detector -atomicwrites==1.3.0 # via pytest attrs==19.3.0 # via black, pytest backcall==0.1.0 # via ipython beautifulsoup4==4.8.1 black==19.10b0 bleach==3.1.0 -certifi==2019.9.11 # via requests, sentry-sdk +certifi==2019.11.28 # via requests, sentry-sdk cffi==1.13.2 # via argon2-cffi, pygit2 chardet==3.0.4 # via requests click==7.0 @@ -18,13 +17,13 @@ cornice==3.6.1 decorator==4.4.1 # via ipython, traitlets dodgy==0.1.9 # via prospector freezegun==0.3.12 -gunicorn==20.0.0 +gunicorn==20.0.4 html5lib==1.0.1 hupper==1.9.1 # via pyramid idna==2.8 # via requests -importlib-metadata==0.23 # via pluggy, pytest +importlib-metadata==1.0.0 # via pluggy, pytest ipython-genutils==0.2.0 # via traitlets -ipython==7.9.0 +ipython==7.10.0 isort==4.3.21 # via pylint jedi==0.15.1 # via ipython jinja2==2.10.3 # via pyramid-jinja2 @@ -33,9 +32,9 @@ mako==1.1.0 # via alembic, pyramid-mako markupsafe==1.1.1 # via jinja2, mako, pyramid-jinja2 marshmallow==2.20.5 mccabe==0.6.1 # via prospector, pylint -more-itertools==7.2.0 # via pytest, zipp +more-itertools==8.0.0 # via pytest, zipp mypy-extensions==0.4.3 # via mypy -mypy==0.740 +mypy==0.750 packaging==19.2 # via pytest parso==0.5.1 # via jedi pastedeploy==2.0.1 # via plaster-pastedeploy @@ -44,12 +43,12 @@ pep8-naming==0.4.1 # via prospector pexpect==4.7.0 # via ipython pickleshare==0.7.5 # via ipython pillow==6.2.1 -pip-tools==4.2.0 +pip-tools==4.3.0 plaster-pastedeploy==0.7 # via pyramid plaster==1.0 # via plaster-pastedeploy, pyramid -pluggy==0.13.0 # via pytest +pluggy==0.13.1 # via pytest prometheus-client==0.7.1 -prompt-toolkit==2.0.10 # via ipython +prompt-toolkit==3.0.2 # via ipython prospector==1.1.7 psycopg2==2.8.4 ptyprocess==0.6.0 # via pexpect @@ -60,7 +59,7 @@ pycparser==2.19 # via cffi pydocstyle==4.0.1 # via prospector pyflakes==1.6.0 # via prospector pygit2==0.28.2 -pygments==2.4.2 +pygments==2.5.2 pylint-celery==0.3 # via prospector pylint-django==2.0.10 # via prospector pylint-flask==0.6 # via prospector @@ -76,8 +75,8 @@ pyramid-session-redis==1.5.0 pyramid-tm==2.3 pyramid-webassets==0.10 pyramid==1.10.4 -pytest-mock==1.11.2 -pytest==5.2.2 +pytest-mock==1.12.1 +pytest==5.3.1 python-dateutil==2.8.1 python-editor==1.0.4 # via alembic pyyaml==5.1.2 @@ -87,15 +86,15 @@ regex==2019.11.1 # via black repoze.lru==0.7 # via pyramid-debugtoolbar requests==2.22.0 requirements-detector==0.6 # via prospector -sentry-sdk==0.13.2 +sentry-sdk==0.13.4 setoptconf==0.2.0 # via prospector -simplejson==3.16.0 # via cornice -six==1.13.0 # via amqpy, argon2-cffi, astroid, bleach, cornice, freezegun, html5lib, packaging, pip-tools, prompt-toolkit, pygit2, pyramid-session-redis, pyramid-webassets, python-dateutil, qrcode, sqlalchemy-utils, traitlets, webtest +simplejson==3.17.0 # via cornice +six==1.13.0 # via amqpy, argon2-cffi, astroid, bleach, cornice, freezegun, html5lib, packaging, pip-tools, pygit2, pyramid-session-redis, pyramid-webassets, python-dateutil, qrcode, sqlalchemy-utils, traitlets, webtest snowballstemmer==2.0.0 # via pydocstyle soupsieve==1.9.5 # via beautifulsoup4 sqlalchemy-utils==0.35.0 sqlalchemy==1.3.11 -stripe==2.40.0 +stripe==2.41.0 testing.common.database==2.0.3 # via testing.redis testing.redis==1.1.1 titlecase==0.12.0 @@ -121,4 +120,4 @@ zope.interface==4.7.1 # via pyramid, pyramid-webassets, transaction, zope.sq zope.sqlalchemy==1.2 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.6.0 # via gunicorn, ipython, plaster, pyramid, zope.deprecation, zope.interface, zope.sqlalchemy +# setuptools==42.0.1 # via gunicorn, ipython, plaster, pyramid, zope.deprecation, zope.interface, zope.sqlalchemy diff --git a/tildes/requirements.txt b/tildes/requirements.txt index 2293855..cb281ef 100644 --- a/tildes/requirements.txt +++ b/tildes/requirements.txt @@ -5,18 +5,18 @@ argon2-cffi==19.2.0 backcall==0.1.0 # via ipython beautifulsoup4==4.8.1 bleach==3.1.0 -certifi==2019.9.11 # via requests, sentry-sdk +certifi==2019.11.28 # via requests, sentry-sdk cffi==1.13.2 # via argon2-cffi, pygit2 chardet==3.0.4 # via requests click==7.0 cornice==3.6.1 decorator==4.4.1 # via ipython, traitlets -gunicorn==20.0.0 +gunicorn==20.0.4 html5lib==1.0.1 hupper==1.9.1 # via pyramid idna==2.8 # via requests ipython-genutils==0.2.0 # via traitlets -ipython==7.9.0 +ipython==7.10.0 jedi==0.15.1 # via ipython jinja2==2.10.3 # via pyramid-jinja2 mako==1.1.0 # via alembic @@ -27,17 +27,17 @@ pastedeploy==2.0.1 # via plaster-pastedeploy pexpect==4.7.0 # via ipython pickleshare==0.7.5 # via ipython pillow==6.2.1 -pip-tools==4.2.0 +pip-tools==4.3.0 plaster-pastedeploy==0.7 # via pyramid plaster==1.0 # via plaster-pastedeploy, pyramid prometheus-client==0.7.1 -prompt-toolkit==2.0.10 # via ipython +prompt-toolkit==3.0.2 # via ipython psycopg2==2.8.4 ptyprocess==0.6.0 # via pexpect publicsuffix2==2.20160818 pycparser==2.19 # via cffi pygit2==0.28.2 -pygments==2.4.2 +pygments==2.5.2 pyotp==2.3.0 pyramid-ipython==0.2 pyramid-jinja2==2.8 @@ -51,13 +51,13 @@ pyyaml==5.1.2 qrcode==6.1 redis==3.3.11 requests==2.22.0 -sentry-sdk==0.13.2 -simplejson==3.16.0 # via cornice -six==1.13.0 # via amqpy, argon2-cffi, bleach, cornice, html5lib, pip-tools, prompt-toolkit, pygit2, pyramid-session-redis, pyramid-webassets, python-dateutil, qrcode, sqlalchemy-utils, traitlets +sentry-sdk==0.13.4 +simplejson==3.17.0 # via cornice +six==1.13.0 # via amqpy, argon2-cffi, bleach, cornice, html5lib, pip-tools, pygit2, pyramid-session-redis, pyramid-webassets, python-dateutil, qrcode, sqlalchemy-utils, traitlets soupsieve==1.9.5 # via beautifulsoup4 sqlalchemy-utils==0.35.0 sqlalchemy==1.3.11 -stripe==2.40.0 +stripe==2.41.0 titlecase==0.12.0 traitlets==4.3.3 # via ipython transaction==2.4.0 # via pyramid-tm, zope.sqlalchemy @@ -75,4 +75,4 @@ zope.interface==4.7.1 # via pyramid, pyramid-webassets, transaction, zope.sq zope.sqlalchemy==1.2 # The following packages are considered to be unsafe in a requirements file: -# setuptools==41.6.0 # via gunicorn, ipython, plaster, pyramid, zope.deprecation, zope.interface, zope.sqlalchemy +# setuptools==42.0.1 # via gunicorn, ipython, plaster, pyramid, zope.deprecation, zope.interface, zope.sqlalchemy diff --git a/tildes/tildes/views/user.py b/tildes/tildes/views/user.py index dd81113..6a455a0 100644 --- a/tildes/tildes/views/user.py +++ b/tildes/tildes/views/user.py @@ -5,6 +5,7 @@ from typing import List, Optional, Type, Union +from enum import Enum from marshmallow.fields import String from pyramid.request import Request from pyramid.view import view_config @@ -121,7 +122,6 @@ def get_user_search( order_options = CommentSortOption # try to get the specified order, but fall back to "newest" - order: Union[TopicSortOption, CommentSortOption] try: order = order_options[order_name.upper()] except KeyError: @@ -174,7 +174,7 @@ def _get_user_posts( anchor_type: Optional[str], before: Optional[str], after: Optional[str], - order: Optional[Union[TopicSortOption, CommentSortOption]], + order: Optional[Enum], per_page: int, search: Optional[str] = None, ) -> Union[PaginatedResults, MixedPaginatedResults]: