Fix CI for Python 3.12 (z-base-32, greenlet and playwright) (#1934)

hasgeek · Nov 29, 2023 · 0fb1096 · 0fb1096
1 parent c7402c2
commit 0fb1096
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 61 deletions.
diff --git a/funnel/models/email_address.py b/funnel/models/email_address.py
@@ -12,8 +12,7 @@
 from pyisemail import is_email
 from pyisemail.diagnosis import BaseDiagnosis
 from sqlalchemy import event, inspect
-from sqlalchemy.orm import Mapper
-from sqlalchemy.orm.attributes import NO_VALUE
+from sqlalchemy.orm import NO_VALUE, Mapper
 from werkzeug.utils import cached_property
 
 from coaster.sqlalchemy import StateManager, auto_init_default, immutable, with_roles

diff --git a/requirements/base.in b/requirements/base.in
@@ -24,7 +24,6 @@ Flask-WTF
 furl
 geoip2
 grapheme
-greenlet<3.0  # Required for asyncio in SQLAlchemy, but version conflict in Playwright
 gunicorn
 html2text
 httpx[http2]
@@ -65,5 +64,5 @@ user-agents
 werkzeug
 whitenoise
 wtforms-sqlalchemy @ git+https://github.com/jace/wtforms-sqlalchemy  # See /pull/1
-z-base-32 @ git+https://github.com/matusf/z-base-32  # See /issues/13 for Py 3.12 fix
+z-base-32
 zxcvbn
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -1,4 +1,4 @@
-# SHA1:2820370229ca38f2e0ba469dbbfe34d0d94623b9
+# SHA1:283bfde436a7e26a2db6733e1859751510b75cc9
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -11,7 +11,7 @@
     # via
     #   -r requirements/base.in
     #   baseframe
-aiohttp==3.8.6
+aiohttp==3.9.1
     # via
     #   aiohttp-retry
     #   geoip2
@@ -27,16 +27,14 @@ alembic==1.12.1
     #   flask-migrate
 aniso8601==9.0.1
     # via coaster
-anyio==4.0.0
+anyio==4.1.0
     # via httpx
 argon2-cffi==23.1.0
     # via -r requirements/base.in
 argon2-cffi-bindings==21.2.0
     # via argon2-cffi
 arrow==1.3.0
     # via rq-dashboard
-async-timeout==4.0.3
-    # via aiohttp
 attrs==23.1.0
     # via aiohttp
 babel==2.13.1
@@ -47,7 +45,7 @@ base58==2.1.1
     # via
     #   -r requirements/base.in
     #   coaster
-bcrypt==4.0.1
+bcrypt==4.1.1
     # via -r requirements/base.in
 better-profanity==0.6.1
     # via -r requirements/base.in
@@ -66,7 +64,7 @@ cachelib==0.9.0
     # via flask-caching
 cachetools==5.3.2
     # via premailer
-certifi==2023.7.22
+certifi==2023.11.17
     # via
     #   httpcore
     #   httpx
@@ -77,9 +75,7 @@ cffi==1.16.0
     #   argon2-cffi-bindings
     #   cryptography
 charset-normalizer==3.3.2
-    # via
-    #   aiohttp
-    #   requests
+    # via requests
 chevron==0.14.0
     # via -r requirements/base.in
 click==8.1.7
@@ -90,15 +86,15 @@ click==8.1.7
     #   rq
 crontab==1.0.1
     # via rq-scheduler
-cryptography==41.0.5
+cryptography==41.0.7
     # via -r requirements/base.in
 cssmin==0.2.0
     # via baseframe
 cssselect==1.2.0
     # via premailer
 cssutils==2.9.0
     # via premailer
-dataclasses-json==0.6.1
+dataclasses-json==0.6.3
     # via -r requirements/base.in
 dnspython==2.4.2
     # via
@@ -138,7 +134,7 @@ flask-caching==2.1.0
     # via baseframe
 flask-executor==1.0.0
     # via -r requirements/base.in
-flask-flatpages==0.8.1
+flask-flatpages==0.8.2
     # via -r requirements/base.in
 flask-mailman==1.0.0
     # via -r requirements/base.in
@@ -178,10 +174,8 @@ grapheme==0.6.0
     # via
     #   -r requirements/base.in
     #   baseframe
-greenlet==2.0.2
-    # via
-    #   -r requirements/base.in
-    #   sqlalchemy
+greenlet==3.0.1
+    # via sqlalchemy
 gunicorn==21.2.0
     # via -r requirements/base.in
 h11==0.14.0
@@ -196,19 +190,19 @@ html5lib==1.1
     # via
     #   baseframe
     #   coaster
-httpcore==1.0.1
+httpcore==1.0.2
     # via httpx
 httplib2==0.22.0
     # via oauth2client
-httpx[http2]==0.25.1
+httpx[http2]==0.25.2
     # via
     #   -r requirements/base.in
     #   python-telegram-bot
 hyperframe==6.0.1
     # via h2
 icalendar==5.0.11
     # via -r requirements/base.in
-idna==3.4
+idna==3.6
     # via
     #   -r requirements/base.in
     #   anyio
@@ -236,7 +230,7 @@ linkify-it-py==2.0.2
     # via -r requirements/base.in
 lxml==4.9.3
     # via premailer
-mako==1.2.4
+mako==1.3.0
     # via alembic
 markdown==3.5.1
     # via
@@ -258,7 +252,7 @@ markupsafe==2.1.3
     #   wtforms
 marshmallow==3.20.1
     # via dataclasses-json
-maxminddb==2.4.0
+maxminddb==2.5.1
     # via geoip2
 mdit-py-plugins==0.4.0
     # via -r requirements/base.in
@@ -288,17 +282,17 @@ packaging==23.2
     #   marshmallow
 passlib==1.7.4
     # via -r requirements/base.in
-phonenumbers==8.13.24
+phonenumbers==8.13.26
     # via -r requirements/base.in
 premailer==3.10.0
     # via -r requirements/base.in
 progressbar2==4.2.0
     # via -r requirements/base.in
-psycopg[binary]==3.1.12
+psycopg[binary]==3.1.13
     # via -r requirements/base.in
-psycopg-binary==3.1.12
+psycopg-binary==3.1.13
     # via psycopg
-pyasn1==0.5.0
+pyasn1==0.5.1
     # via
     #   oauth2client
     #   pyasn1-modules
@@ -311,7 +305,7 @@ pycountry==22.3.5
     #   baseframe
 pycparser==2.21
     # via cffi
-pygments==2.16.1
+pygments==2.17.2
     # via rich
 pyisemail==2.0.1
     # via
@@ -320,7 +314,7 @@ pyisemail==2.0.1
     #   mxsniff
 pyjwt==2.8.0
     # via twilio
-pymdown-extensions==10.3.1
+pymdown-extensions==10.5
     # via coaster
 pyparsing==3.1.1
     # via httplib2
@@ -338,7 +332,7 @@ python-dateutil==2.8.2
     #   rq-scheduler
 python-dotenv==1.0.0
     # via -r requirements/base.in
-python-telegram-bot==20.6
+python-telegram-bot==20.7
     # via -r requirements/base.in
 python-utils==3.8.1
     # via progressbar2
@@ -386,7 +380,7 @@ requests-file==1.5.1
     # via tldextract
 requests-oauthlib==1.3.1
     # via tweepy
-rich==13.6.0
+rich==13.7.0
     # via -r requirements/base.in
 rq==1.15.1
     # via
@@ -405,7 +399,7 @@ semantic-version==2.10.0
     # via
     #   baseframe
     #   coaster
-sentry-sdk==1.34.0
+sentry-sdk==1.38.0
     # via baseframe
 six==1.16.0
     # via
@@ -442,7 +436,7 @@ statsd==4.0.1
     # via baseframe
 tinydb==4.8.0
     # via tuspy
-tldextract==5.1.0
+tldextract==5.1.1
     # via
     #   coaster
     #   mxsniff
@@ -452,7 +446,7 @@ tuspy==1.0.1
     # via pyvimeo
 tweepy==4.14.0
     # via -r requirements/base.in
-twilio==8.10.0
+twilio==8.10.2
     # via -r requirements/base.in
 types-python-dateutil==2.8.19.14
     # via arrow
@@ -477,7 +471,7 @@ uc-micro-py==1.0.2
     # via linkify-it-py
 unidecode==1.3.7
     # via coaster
-urllib3[socks]==2.0.7
+urllib3[socks]==2.1.0
     # via
     #   -r requirements/base.in
     #   requests
@@ -507,9 +501,9 @@ wtforms-sqlalchemy @ git+https://github.com/jace/wtforms-sqlalchemy
     # via
     #   -r requirements/base.in
     #   baseframe
-yarl==1.9.2
+yarl==1.9.3
     # via aiohttp
-z-base-32 @ git+https://github.com/matusf/z-base-32
+z-base-32==0.1.3
     # via -r requirements/base.in
 zxcvbn==4.4.28
     # via -r requirements/base.in

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -16,15 +16,15 @@ astroid==3.0.1
     # via pylint
 bandit==1.7.5
     # via -r requirements/dev.in
-black==23.10.1
+black==23.11.0
     # via -r requirements/dev.in
 build==1.0.3
     # via pip-tools
 cattrs==22.1.0
     # via reformat-gherkin
 cfgv==3.4.0
     # via pre-commit
-cssbeautifier==1.14.9
+cssbeautifier==1.14.11
     # via djlint
 dill==0.3.7
     # via pylint
@@ -55,7 +55,7 @@ flake8-assertive==2.1.0
     # via -r requirements/dev.in
 flake8-blind-except==0.2.1
     # via -r requirements/dev.in
-flake8-bugbear==23.9.16
+flake8-bugbear==23.11.28
     # via -r requirements/dev.in
 flake8-builtins==2.2.0
     # via -r requirements/dev.in
@@ -87,14 +87,14 @@ html-tag-names==0.1.2
     # via djlint
 html-void-elements==0.1.0
     # via djlint
-identify==2.5.31
+identify==2.5.32
     # via pre-commit
 isort==5.12.0
     # via
     #   -r requirements/dev.in
     #   flake8-isort
     #   pylint
-jsbeautifier==1.14.9
+jsbeautifier==1.14.11
     # via
     #   cssbeautifier
     #   djlint
@@ -106,7 +106,7 @@ mccabe==0.7.0
     # via
     #   flake8
     #   pylint
-mypy==1.6.1
+mypy==1.7.1
     # via -r requirements/dev.in
 mypy-json-report==1.0.4
     # via -r requirements/dev.in
@@ -116,15 +116,15 @@ pathspec==0.11.2
     # via
     #   black
     #   djlint
-pbr==5.11.1
+pbr==6.0.0
     # via stevedore
 pep8-naming==0.13.3
     # via -r requirements/dev.in
 pip-compile-multi==2.6.3
     # via -r requirements/dev.in
 pip-tools==7.3.0
     # via pip-compile-multi
-platformdirs==3.11.0
+platformdirs==4.0.0
     # via
     #   black
     #   pylint
@@ -149,7 +149,7 @@ pyupgrade==3.15.0
     # via -r requirements/dev.in
 reformat-gherkin==3.0.1
     # via -r requirements/dev.in
-ruff==0.1.4
+ruff==0.1.6
     # via -r requirements/dev.in
 smmap==5.0.1
     # via gitdb
@@ -169,21 +169,21 @@ types-ipaddress==1.0.8
     # via types-maxminddb
 types-maxminddb==1.5.0
     # via types-geoip2
-types-mock==5.1.0.2
+types-mock==5.1.0.3
     # via -r requirements/dev.in
 types-pyopenssl==23.3.0.0
     # via types-redis
 types-pytz==2023.3.1.1
     # via -r requirements/dev.in
-types-redis==4.6.0.9
+types-redis==4.6.0.11
     # via -r requirements/dev.in
 types-requests==2.31.0.10
     # via -r requirements/dev.in
-virtualenv==20.24.6
+virtualenv==20.24.7
     # via pre-commit
-wcwidth==0.2.9
+wcwidth==0.2.12
     # via reformat-gherkin
-wheel==0.41.3
+wheel==0.42.0
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file: