This commit is contained in:
codl 2022-03-01 00:59:55 +01:00
parent a66ad7db9c
commit 61700f3dd9
5 changed files with 161 additions and 88 deletions

View File

@ -9,10 +9,11 @@ name = "pypi"
alembic = "*" alembic = "*"
brotli = ">=1.0.1" brotli = ">=1.0.1"
#celery = "~=4.4.2"
celery = "*" celery = "*"
csscompressor = "*" csscompressor = "*"
doit = "*" doit = "*"
flask = "~=1.1" flask = ">=1.1"
flask-migrate = "*" flask-migrate = "*"
flask-sqlalchemy = "*" flask-sqlalchemy = "*"
gunicorn = ">=19.8" gunicorn = ">=19.8"
@ -24,7 +25,7 @@ redis = "*"
requests = "*" requests = "*"
sqlalchemy = "*" sqlalchemy = "*"
twitter = "*" twitter = "*"
"mastodon.py" = "~=1.2" "mastodon.py" = ">=1.2"
blinker = "*" blinker = "*"

54
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "4d0638b37783887460f4a487a9f61e9ea9b7ada021d4ce62c48946e4f304097e" "sha256": "303bcf089bbe8f0553f850a13d4b6672225620532fe4813d061c45db0d940fc8"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": {}, "requires": {},
@ -121,11 +121,11 @@
}, },
"celery": { "celery": {
"hashes": [ "hashes": [
"sha256:8d9a3de9162965e97f8e8cc584c67aad83b3f7a267584fa47701ed11c3e0d4b0", "sha256:8aacd02fc23a02760686d63dde1eb0daa9f594e735e73ea8fb15c2ff15cb608c",
"sha256:9dab2170b4038f7bf10ef2861dbf486ddf1d20592290a1040f7b7a1259705d42" "sha256:e2cd41667ad97d4f6a2f4672d1c6a6ebada194c619253058b5f23704aaadaa82"
], ],
"index": "pypi", "index": "pypi",
"version": "==5.1.2" "version": "==5.2.3"
}, },
"certifi": { "certifi": {
"hashes": [ "hashes": [
@ -144,11 +144,11 @@
}, },
"click": { "click": {
"hashes": [ "hashes": [
"sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", "sha256:6a7a62563bbfabfda3a38f3023a1db4a35978c0abd76f6c9605ecd6554d6d9b1",
"sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" "sha256:8458d7b1287c5fb128c90e23381cf99dcde74beaf6c7ff6384ce84d6fe090adb"
], ],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "markers": "python_version >= '3.6'",
"version": "==7.1.2" "version": "==8.0.4"
}, },
"click-didyoumean": { "click-didyoumean": {
"hashes": [ "hashes": [
@ -213,11 +213,11 @@
}, },
"flask": { "flask": {
"hashes": [ "hashes": [
"sha256:0fbeb6180d383a9186d0d6ed954e0042ad9f18e0e8de088b2b419d526927d196", "sha256:59da8a3170004800a2837844bfa84d49b022550616070f7cb1a659682b2e7c9f",
"sha256:c34f04500f2cbbea882b1acb02002ad6fe6b7ffa64a6164577995657f50aed22" "sha256:e1120c228ca2f553b470df4a5fa927ab66258467526069981b3eb0a91902687d"
], ],
"index": "pypi", "index": "pypi",
"version": "==1.1.4" "version": "==2.0.3"
}, },
"flask-migrate": { "flask-migrate": {
"hashes": [ "hashes": [
@ -322,19 +322,19 @@
}, },
"itsdangerous": { "itsdangerous": {
"hashes": [ "hashes": [
"sha256:321b033d07f2a4136d3ec762eac9f16a10ccd60f53c0c91af90217ace7ba1f19", "sha256:29285842166554469a56d427addc0843914172343784cb909695fdbe90a3e129",
"sha256:b12271b2047cb23eeb98c8b5622e2e5c5e9abd9784a153e9d8ef9cb4dd09d749" "sha256:d848fcb8bc7d507c4546b448574e8a44fc4ea2ba84ebf8d783290d53e81992f5"
], ],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "markers": "python_version >= '3.7'",
"version": "==1.1.0" "version": "==2.1.0"
}, },
"jinja2": { "jinja2": {
"hashes": [ "hashes": [
"sha256:03e47ad063331dd6a3f04a43eddca8a966a26ba0c5b7207a9a9e4e08f1b29419", "sha256:077ce6014f7b40d03b47d1f1ca4b0fc8328a692bd284016f806ed0eaca390ad8",
"sha256:a6d58433de0ae800347cab1fa3043cebbabe8baa9d29e668f1c768cb87a333c6" "sha256:611bb273cd68f3b993fabdc4064fc858c5b47a973cb5aa7999ec1ba405c87cd7"
], ],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "markers": "python_version >= '3.6'",
"version": "==2.11.3" "version": "==3.0.3"
}, },
"kombu": { "kombu": {
"hashes": [ "hashes": [
@ -544,11 +544,11 @@
}, },
"setuptools": { "setuptools": {
"hashes": [ "hashes": [
"sha256:2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5", "sha256:22c7348c6d2976a52632c67f7ab0cdf40147db7789f9aed18734643fe9cf3373",
"sha256:e4f30b9f84e5ab3decf945113119649fec09c1fc3507c6ebffec75646c56e62b" "sha256:4ce92f1e1f8f01233ee9952c04f6b81d1e02939d6e1b488428154974a4d0783e"
], ],
"markers": "python_version >= '3.7'", "markers": "python_version >= '3.6'",
"version": "==60.9.3" "version": "==59.6.0"
}, },
"six": { "six": {
"hashes": [ "hashes": [
@ -633,11 +633,11 @@
}, },
"werkzeug": { "werkzeug": {
"hashes": [ "hashes": [
"sha256:2de2a5db0baeae7b2d2664949077c2ac63fbd16d98da0ff71837f7d1dea3fd43", "sha256:1421ebfc7648a39a5c58c601b154165d05cf47a3cd0ccb70857cbdacf6c8f2b8",
"sha256:6c80b1e5ad3665290ea39320b91e1be1e0d5f60652b964a3070216de83d2e47c" "sha256:b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c"
], ],
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", "markers": "python_version >= '3.6'",
"version": "==1.0.1" "version": "==2.0.3"
}, },
"wrapt": { "wrapt": {
"hashes": [ "hashes": [

View File

@ -1,23 +1,77 @@
-i https://pypi.python.org/simple/ #
attrs==20.3.0 # These requirements were autogenerated by pipenv
certifi==2020.12.5 # To regenerate from the project's Pipfile, run:
chardet==4.0.0 #
codecov==2.1.11 # pipenv lock --requirements --dev
coverage==5.5 #
idna==2.10
# Note: in pipenv 2020.x, "--dev" changed to emit both default and development
# requirements. To emit only development requirements, pass "--dev-only".
-i https://pypi.python.org/simple
alembic==1.7.6
amqp==5.0.9; python_version >= '3.6'
attrs==21.4.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
billiard==3.6.4.0
blinker==1.4
blurhash==1.1.4
brotli==1.0.9
celery==5.2.3
certifi==2021.10.8
charset-normalizer==2.0.12; python_version >= '3'
click-didyoumean==0.3.0; python_full_version >= '3.6.2' and python_full_version < '4.0.0'
click-plugins==1.1.1
click-repl==0.2.0
click==8.0.4; python_version >= '3.6'
cloudpickle==2.0.0; python_version >= '3.6'
codecov==2.1.12
coverage==6.3.2
csscompressor==0.9.5
decorator==5.1.1; python_version >= '3.5'
deprecated==1.2.13; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
doit==0.34.2
flask-migrate==3.1.0
flask-sqlalchemy==2.5.1
flask==2.0.3
greenlet==1.1.2; python_version >= '3' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))
gunicorn==20.1.0
honcho==1.1.0
idna==3.3; python_version >= '3'
iniconfig==1.1.1 iniconfig==1.1.1
mirakuru==2.3.0 itsdangerous==2.1.0; python_version >= '3.7'
packaging==20.9 jinja2==3.0.3; python_version >= '3.6'
pluggy==0.13.1 kombu==5.2.3; python_version >= '3.7'
port-for==0.4 mako==1.1.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
psutil==5.8.0 ; sys_platform != 'cygwin' markupsafe==2.1.0; python_version >= '3.7'
py==1.10.0 mastodon.py==1.5.1
pyparsing==2.4.7 mirakuru==2.4.2; python_version >= '3.7'
pytest-cov==2.11.1 packaging==21.3; python_version >= '3.6'
pytest-redis==2.0.0 pillow==9.0.1
pytest==6.2.2 pluggy==1.0.0; python_version >= '3.6'
redis==3.5.3 port-for==0.6.2; python_version >= '3.7'
requests==2.25.1 prompt-toolkit==3.0.28; python_full_version >= '3.6.2'
toml==0.10.2 psutil==5.9.0; sys_platform != 'cygwin'
urllib3==1.26.4 psycopg2==2.9.3
versioneer==0.19 py==1.11.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
pyinotify==0.9.6; sys_platform == 'linux'
pyparsing==3.0.7; python_version >= '3.6'
pytest-cov==3.0.0
pytest-redis==2.4.0
pytest==7.0.1
python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
python-magic==0.4.25; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
pytz==2021.3
raven==6.10.0
redis==4.1.4
requests==2.27.1
setuptools==59.6.0; python_version >= '3.6'
six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
sqlalchemy==1.4.31
tomli==2.0.1; python_version >= '3.7'
twitter==1.19.3
urllib3==1.26.8; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'
versioneer==0.21
vine==5.0.0; python_version >= '3.6'
wcwidth==0.2.5
werkzeug==2.0.3; python_version >= '3.6'
wrapt==1.13.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'

View File

@ -1,43 +1,60 @@
-i https://pypi.python.org/simple/ #
alembic==1.5.8 # These requirements were autogenerated by pipenv
amqp==2.6.1 # To regenerate from the project's Pipfile, run:
billiard==3.6.3.0 #
# pipenv lock --requirements
#
-i https://pypi.python.org/simple
alembic==1.7.6
amqp==5.0.9; python_version >= '3.6'
billiard==3.6.4.0
blinker==1.4 blinker==1.4
blurhash==1.1.4 blurhash==1.1.4
brotli==1.0.9 brotli==1.0.9
celery==4.4.2 celery==5.2.3
certifi==2020.12.5 certifi==2021.10.8
chardet==4.0.0 charset-normalizer==2.0.12; python_version >= '3'
click==7.1.2 click-didyoumean==0.3.0; python_full_version >= '3.6.2' and python_full_version < '4.0.0'
cloudpickle==1.6.0 click-plugins==1.1.1
click-repl==0.2.0
click==8.0.4; python_version >= '3.6'
cloudpickle==2.0.0; python_version >= '3.6'
csscompressor==0.9.5 csscompressor==0.9.5
decorator==4.4.2 decorator==5.1.1; python_version >= '3.5'
doit==0.33.1 deprecated==1.2.13; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
flask-migrate==2.5.3 doit==0.34.2
flask-sqlalchemy==2.4.4 flask-migrate==3.1.0
flask==1.1.2 flask-sqlalchemy==2.5.1
gunicorn==20.0.4 flask==2.0.3
honcho==1.0.1 greenlet==1.1.2; python_version >= '3' and platform_machine == 'aarch64' or (platform_machine == 'ppc64le' or (platform_machine == 'x86_64' or (platform_machine == 'amd64' or (platform_machine == 'AMD64' or (platform_machine == 'win32' or platform_machine == 'WIN32')))))
idna==2.10 gunicorn==20.1.0
itsdangerous==1.1.0 honcho==1.1.0
jinja2==2.11.3 idna==3.3; python_version >= '3'
kombu==4.6.11 itsdangerous==2.1.0; python_version >= '3.7'
mako==1.1.4 jinja2==3.0.3; python_version >= '3.6'
markupsafe==1.1.1 kombu==5.2.3; python_version >= '3.7'
mako==1.1.6; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
markupsafe==2.1.0; python_version >= '3.7'
mastodon.py==1.5.1 mastodon.py==1.5.1
pillow==8.1.2 packaging==21.3; python_version >= '3.6'
psycopg2==2.8.6 pillow==9.0.1
prompt-toolkit==3.0.28; python_full_version >= '3.6.2'
psycopg2==2.9.3
pyinotify==0.9.6; sys_platform == 'linux' pyinotify==0.9.6; sys_platform == 'linux'
python-dateutil==2.8.1 pyparsing==3.0.7; python_version >= '3.6'
python-editor==1.0.4 python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
python-magic==0.4.22 python-magic==0.4.25; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
pytz==2021.1 pytz==2021.3
raven==6.10.0 raven==6.10.0
redis==3.5.3 redis==4.1.4
requests==2.25.1 requests==2.27.1
six==1.15.0 setuptools==59.6.0; python_version >= '3.6'
sqlalchemy==1.3.23 six==1.16.0; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
twitter==1.18.0 sqlalchemy==1.4.31
urllib3==1.26.4 twitter==1.19.3
vine==1.3.0 urllib3==1.26.8; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_full_version < '4.0.0'
werkzeug==1.0.1 vine==5.0.0; python_version >= '3.6'
wcwidth==0.2.5
werkzeug==2.0.3; python_version >= '3.6'
wrapt==1.13.3; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'

View File

@ -23,6 +23,7 @@ app = Celery(
'tasks', 'tasks',
broker=flaskapp.config['CELERY_BROKER'], broker=flaskapp.config['CELERY_BROKER'],
task_serializer='pickle', task_serializer='pickle',
accept_content={'pickle',},
task_soft_time_limit=600, task_soft_time_limit=600,
task_time_limit=1200, task_time_limit=1200,
) )