kopia lustrzana https://github.com/jedie/PyInventory
replace uwsgi with gunicorn
JensDiemer
rodzic
b3944c8365
commit
b8f14b19af
|
|
@ -35,18 +35,8 @@ fi
|
|||
./manage.py collectstatic --noinput
|
||||
./manage.py migrate
|
||||
|
||||
uwsgi \
|
||||
--http "$(hostname):8000" \
|
||||
--wsgi-file /django/wsgi.py \
|
||||
--master \
|
||||
--processes 2 \
|
||||
--threads 2 \
|
||||
--ignore-sigpipe \
|
||||
--ignore-write-errors \
|
||||
--disable-write-exception \
|
||||
--http-auto-chunked \
|
||||
--http-keepalive
|
||||
echo "uwsgi terminated with exit code: $?"
|
||||
gunicorn wsgi --bind "$(hostname):8000"
|
||||
echo "gunicorn terminated with exit code: $?"
|
||||
sleep 3
|
||||
exit 1
|
||||
)
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ toml = ["toml"]
|
|||
|
||||
[[package]]
|
||||
name = "coveralls"
|
||||
version = "2.1.2"
|
||||
version = "2.2.0"
|
||||
description = "Show coverage stats online via coveralls.io"
|
||||
category = "dev"
|
||||
optional = false
|
||||
|
|
@ -502,6 +502,20 @@ python-versions = ">=3.6"
|
|||
[package.dependencies]
|
||||
astor = "*"
|
||||
|
||||
[[package]]
|
||||
name = "gunicorn"
|
||||
version = "20.0.4"
|
||||
description = "WSGI HTTP Server for UNIX"
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = ">=3.4"
|
||||
|
||||
[package.extras]
|
||||
eventlet = ["eventlet (>=0.9.7)"]
|
||||
gevent = ["gevent (>=0.13)"]
|
||||
setproctitle = ["setproctitle"]
|
||||
tornado = ["tornado (>=0.2)"]
|
||||
|
||||
[[package]]
|
||||
name = "icdiff"
|
||||
version = "1.9.1"
|
||||
|
|
@ -564,7 +578,7 @@ python-versions = "*"
|
|||
|
||||
[[package]]
|
||||
name = "jeepney"
|
||||
version = "0.5.0"
|
||||
version = "0.6.0"
|
||||
description = "Low-level, pure Python DBus protocol wrapper."
|
||||
category = "dev"
|
||||
optional = false
|
||||
|
|
@ -890,7 +904,7 @@ tblib = "*"
|
|||
|
||||
[[package]]
|
||||
name = "pytest-randomly"
|
||||
version = "3.4.1"
|
||||
version = "3.5.0"
|
||||
description = "Pytest plugin to randomly order tests and control random.seed."
|
||||
category = "dev"
|
||||
optional = false
|
||||
|
|
@ -1144,14 +1158,14 @@ testing = ["flaky (>=3.4.0)", "freezegun (>=0.3.11)", "pathlib2 (>=2.3.3)", "psu
|
|||
|
||||
[[package]]
|
||||
name = "tqdm"
|
||||
version = "4.51.0"
|
||||
version = "4.53.0"
|
||||
description = "Fast, Extensible Progress Meter"
|
||||
category = "dev"
|
||||
optional = false
|
||||
python-versions = ">=2.6, !=3.0.*, !=3.1.*"
|
||||
python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
|
||||
|
||||
[package.extras]
|
||||
dev = ["py-make (>=0.1.0)", "twine", "argopt", "pydoc-markdown"]
|
||||
dev = ["py-make (>=0.1.0)", "twine", "argopt", "pydoc-markdown", "wheel"]
|
||||
|
||||
[[package]]
|
||||
name = "twine"
|
||||
|
|
@ -1185,17 +1199,9 @@ brotli = ["brotlipy (>=0.6.0)"]
|
|||
secure = ["pyOpenSSL (>=0.14)", "cryptography (>=1.3.4)", "idna (>=2.0.0)", "certifi", "ipaddress"]
|
||||
socks = ["PySocks (>=1.5.6,!=1.5.7,<2.0)"]
|
||||
|
||||
[[package]]
|
||||
name = "uwsgi"
|
||||
version = "2.0.19.1"
|
||||
description = "The uWSGI server"
|
||||
category = "main"
|
||||
optional = false
|
||||
python-versions = "*"
|
||||
|
||||
[[package]]
|
||||
name = "virtualenv"
|
||||
version = "20.1.0"
|
||||
version = "20.2.0"
|
||||
description = "Virtual Python Environment builder"
|
||||
category = "dev"
|
||||
optional = false
|
||||
|
|
@ -1266,7 +1272,7 @@ postgres = ["psycopg2-binary"]
|
|||
[metadata]
|
||||
lock-version = "1.1"
|
||||
python-versions = ">=3.7,<4.0.0"
|
||||
content-hash = "255146b2cf501cee5d0301c28f1b0ce6b03ecf3ff94d28ad46318c944aad7bc9"
|
||||
content-hash = "bb178e486925b95face37987e21f66c19a2e82194a0bc508d1c69eda4f105ce3"
|
||||
|
||||
[metadata.files]
|
||||
appdirs = [
|
||||
|
|
@ -1399,8 +1405,8 @@ coverage = [
|
|||
{file = "coverage-5.3.tar.gz", hash = "sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0"},
|
||||
]
|
||||
coveralls = [
|
||||
{file = "coveralls-2.1.2-py2.py3-none-any.whl", hash = "sha256:b3b60c17b03a0dee61952a91aed6f131e0b2ac8bd5da909389c53137811409e1"},
|
||||
{file = "coveralls-2.1.2.tar.gz", hash = "sha256:4430b862baabb3cf090d36d84d331966615e4288d8a8c5957e0fd456d0dd8bd6"},
|
||||
{file = "coveralls-2.2.0-py2.py3-none-any.whl", hash = "sha256:2301a19500b06649d2ec4f2858f9c69638d7699a4c63027c5d53daba666147cc"},
|
||||
{file = "coveralls-2.2.0.tar.gz", hash = "sha256:b990ba1f7bc4288e63340be0433698c1efe8217f78c689d254c2540af3d38617"},
|
||||
]
|
||||
cryptography = [
|
||||
{file = "cryptography-3.2.1-cp27-cp27m-macosx_10_10_x86_64.whl", hash = "sha256:6dc59630ecce8c1f558277ceb212c751d6730bd12c80ea96b4ac65637c4f55e7"},
|
||||
|
|
@ -1527,6 +1533,10 @@ flynt = [
|
|||
{file = "flynt-0.57-py3-none-any.whl", hash = "sha256:b99e8a172162b77518a5fd2d4ef64b9498d9e60d79b6fef3e9b5546e4b649c46"},
|
||||
{file = "flynt-0.57.tar.gz", hash = "sha256:14c68ca85c852092a64c9b8f7ccdb8e9acd36c4d9d58acc99344314fd90e20c9"},
|
||||
]
|
||||
gunicorn = [
|
||||
{file = "gunicorn-20.0.4-py2.py3-none-any.whl", hash = "sha256:cd4a810dd51bf497552cf3f863b575dabd73d6ad6a91075b65936b151cbf4f9c"},
|
||||
{file = "gunicorn-20.0.4.tar.gz", hash = "sha256:1904bb2b8a43658807108d59c3f3d56c2b6121a701161de0ddf9ad140073c626"},
|
||||
]
|
||||
icdiff = [
|
||||
{file = "icdiff-1.9.1.tar.gz", hash = "sha256:66972dd03318da55280991db375d3ef6b66d948c67af96c1ebdb21587e86655e"},
|
||||
]
|
||||
|
|
@ -1550,8 +1560,8 @@ jdcal = [
|
|||
{file = "jdcal-1.4.1.tar.gz", hash = "sha256:472872e096eb8df219c23f2689fc336668bdb43d194094b5cc1707e1640acfc8"},
|
||||
]
|
||||
jeepney = [
|
||||
{file = "jeepney-0.5.0-py3-none-any.whl", hash = "sha256:e0e057fe2069a54257de32eb26cf14aac5fa90f5836f49926009a5022fb1e31a"},
|
||||
{file = "jeepney-0.5.0.tar.gz", hash = "sha256:2531d17ccfb3485d4eaee03c1a19a75f28b3ac0fbb5a1b683b77b820e5b0f509"},
|
||||
{file = "jeepney-0.6.0-py3-none-any.whl", hash = "sha256:aec56c0eb1691a841795111e184e13cad504f7703b9a64f63020816afa79a8ae"},
|
||||
{file = "jeepney-0.6.0.tar.gz", hash = "sha256:7d59b6622675ca9e993a6bd38de845051d315f8b0c72cca3aef733a20b648657"},
|
||||
]
|
||||
jsonschema = [
|
||||
{file = "jsonschema-3.2.0-py2.py3-none-any.whl", hash = "sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163"},
|
||||
|
|
@ -1733,8 +1743,8 @@ pytest-parallel = [
|
|||
{file = "pytest_parallel-0.1.0-py3-none-any.whl", hash = "sha256:10693161e350b59466ca331bad964073555cda114cc0499bd826deeceee512ed"},
|
||||
]
|
||||
pytest-randomly = [
|
||||
{file = "pytest-randomly-3.4.1.tar.gz", hash = "sha256:5fd0dbeeb218a7ce029690a8100453cd8d6a7972cf9d8e657690352692e92c69"},
|
||||
{file = "pytest_randomly-3.4.1-py3-none-any.whl", hash = "sha256:2c4df1390db72a33a4f44fac0c780e7883cd5968238efa2a2bdbdd54e3fc6681"},
|
||||
{file = "pytest-randomly-3.5.0.tar.gz", hash = "sha256:440cec143fd9b0adeb072006c71e0294402a2bc2ccd08079c2341087ba4cf2d1"},
|
||||
{file = "pytest_randomly-3.5.0-py3-none-any.whl", hash = "sha256:9db10d160237f3f8ee60cef72e4cb9ea88d2893c9dd5c8aa334b060cdeb67c3a"},
|
||||
]
|
||||
python-creole = [
|
||||
{file = "python-creole-1.4.9.tar.gz", hash = "sha256:2d0e01229c12a6ba769d6d12f200af81127c2696cfb2f9627cd001755e77ab85"},
|
||||
|
|
@ -1840,8 +1850,8 @@ tox = [
|
|||
{file = "tox-3.20.1.tar.gz", hash = "sha256:4321052bfe28f9d85082341ca8e233e3ea901fdd14dab8a5d3fbd810269fbaf6"},
|
||||
]
|
||||
tqdm = [
|
||||
{file = "tqdm-4.51.0-py2.py3-none-any.whl", hash = "sha256:9ad44aaf0fc3697c06f6e05c7cf025dd66bc7bcb7613c66d85f4464c47ac8fad"},
|
||||
{file = "tqdm-4.51.0.tar.gz", hash = "sha256:ef54779f1c09f346b2b5a8e5c61f96fbcb639929e640e59f8cf810794f406432"},
|
||||
{file = "tqdm-4.53.0-py2.py3-none-any.whl", hash = "sha256:5ff3f5232b19fa4c5531641e480b7fad4598819f708a32eb815e6ea41c5fa313"},
|
||||
{file = "tqdm-4.53.0.tar.gz", hash = "sha256:3d3f1470d26642e88bd3f73353cb6ff4c51ef7d5d7efef763238f4bc1f7e4e81"},
|
||||
]
|
||||
twine = [
|
||||
{file = "twine-3.2.0-py3-none-any.whl", hash = "sha256:ba9ff477b8d6de0c89dd450e70b2185da190514e91c42cc62f96850025c10472"},
|
||||
|
|
@ -1851,12 +1861,9 @@ urllib3 = [
|
|||
{file = "urllib3-1.26.2-py2.py3-none-any.whl", hash = "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473"},
|
||||
{file = "urllib3-1.26.2.tar.gz", hash = "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08"},
|
||||
]
|
||||
uwsgi = [
|
||||
{file = "uWSGI-2.0.19.1.tar.gz", hash = "sha256:faa85e053c0b1be4d5585b0858d3a511d2cd10201802e8676060fd0a109e5869"},
|
||||
]
|
||||
virtualenv = [
|
||||
{file = "virtualenv-20.1.0-py2.py3-none-any.whl", hash = "sha256:b0011228208944ce71052987437d3843e05690b2f23d1c7da4263fde104c97a2"},
|
||||
{file = "virtualenv-20.1.0.tar.gz", hash = "sha256:b8d6110f493af256a40d65e29846c69340a947669eec8ce784fcf3dd3af28380"},
|
||||
{file = "virtualenv-20.2.0-py2.py3-none-any.whl", hash = "sha256:6af42359fbb33a6c7eab4d3246524b96fd9d8e07e7141b7a65998f96e28b2c57"},
|
||||
{file = "virtualenv-20.2.0.tar.gz", hash = "sha256:fd4147c5ba3f694e2e4fc3c767407dc2226899623bb9b49c2f15637c2ee335b3"},
|
||||
]
|
||||
webencodings = [
|
||||
{file = "webencodings-0.5.1-py2.py3-none-any.whl", hash = "sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78"},
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ readme='README.rst'
|
|||
python = ">=3.7,<4.0.0"
|
||||
colorama = "*" # Console colors under windows: https://pypi.org/project/colorama/
|
||||
colorlog = "*" # https://github.com/borntyping/python-colorlog
|
||||
uWSGI = "*"
|
||||
gunicorn = "*" # https://github.com/benoimyproject.wsgitc/gunicorn
|
||||
#
|
||||
# https://www.djangoproject.com/download/#supported-versions
|
||||
# v2.2 LTS - extended support until April 2022
|
||||
|
|
@ -49,7 +49,7 @@ django-reversion-compare = "*" # https://github.com/jedie/django-reversion-comp
|
|||
django-ckeditor = "*" # https://github.com/django-ckeditor/django-ckeditor
|
||||
|
||||
# We can't install v5 until https://github.com/python-poetry/poetry/issues/3320 is fixed!
|
||||
bx_py_utils = "!=5" # https://github.com/boxine/bx_py_utils
|
||||
bx_py_utils = "0.0.4" # https://github.com/boxine/bx_py_utils
|
||||
|
||||
django-tagulous = "*" # https://github.com/radiac/django-tagulous
|
||||
django-admin-sortable2 = "*" # https://github.com/jrief/django-admin-sortable2
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue