Skip to content
This repository has been archived by the owner on Oct 23, 2023. It is now read-only.

Bump aiohttp from 3.7.4.post0 to 3.8.1 #221

Merged
merged 5 commits into from
Jan 3, 2022
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
drop support for python 3.6
blankdots committed Jan 3, 2022
commit d0e703f56947328b1357b860ba764fadc65085ba
6 changes: 3 additions & 3 deletions .github/workflows/s2i-build.yml
Original file line number Diff line number Diff line change
@@ -18,9 +18,9 @@ jobs:

- name: Install requirements
run: |
wget https://github.com/openshift/source-to-image/releases/download/v1.2.0/source-to-image-v1.2.0-2a579ecd-linux-amd64.tar.gz
tar -xvf source-to-image-v1.2.0-2a579ecd-linux-amd64.tar.gz
wget https://github.com/openshift/source-to-image/releases/download/v1.3.1/source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
tar -xvf source-to-image-v1.3.1-a5a77147-linux-amd64.tar.gz
sudo cp s2i /usr/local/bin
- name: Build image
run: |
s2i build . centos/python-36-centos7 cscfi/beacon-python
s2i build . centos/python-38-centos7 cscfi/beacon-python
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ Documentation: https://beacon-python.readthedocs.io
### Quick start

`beacon-python` Web Server requires:
* Python 3.6+;
* Python 3.8+;
* running DB [PostgreSQL Server](https://www.postgresql.org/) 9.6+ (recommended 11.6).

```shell
12 changes: 9 additions & 3 deletions beacon_api/app.py
Original file line number Diff line number Diff line change
@@ -125,11 +125,17 @@ def main():
# sslcontext.load_cert_chain(ssl_certfile, ssl_keyfile)
# sslcontext = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
# sslcontext.check_hostname = False
web.run_app(init(), host=os.environ.get("HOST", "0.0.0.0"), port=os.environ.get("PORT", "5050"), shutdown_timeout=0, ssl_context=None) # nosec # nosec
web.run_app(
init(),
host=os.environ.get("HOST", "0.0.0.0"),
port=os.environ.get("PORT", "5050"),
shutdown_timeout=0,
ssl_context=None,
) # nosec # nosec


if __name__ == "__main__":
if sys.version_info < (3, 6):
LOG.error("beacon-python requires python 3.6")
if sys.version_info < (3, 8):
LOG.error("beacon-python requires python 3.8")
sys.exit(1)
main()
2 changes: 1 addition & 1 deletion docs/instructions.rst
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ Instructions

.. note:: In order to run ``beacon-python`` Web Server requirements are as specified below:

* Python 3.6+;
* Python 3.8+;
* running DB `PostgreSQL Server <https://www.postgresql.org/>`_ 9.6+ (recommended 11.6).

.. _env-setup:
12 changes: 4 additions & 8 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
aiohttp==3.8.1
aiohttp-cors==0.7.0
asyncpg==0.25.0
jsonschema==3.2.0; python_version < '3.7'
jsonschema==4.3.2; python_version >= '3.7'
jsonschema==4.3.2
Cython==0.29.26
cyvcf2==0.10.1; python_version < '3.7'
cyvcf2; python_version >= '3.7'
uvloop==0.14.0; python_version < '3.7'
uvloop==0.16.0; python_version >= '3.7'
cyvcf2==0.30.14
uvloop==0.16.0
aiocache==0.11.1
ujson==4.3.0; python_version < '3.7'
ujson==5.1.0; python_version >= '3.7'
ujson==5.1.0
aiomcache==0.6.0
Authlib==0.15.5
gunicorn==20.1.0
17 changes: 6 additions & 11 deletions setup.py
Original file line number Diff line number Diff line change
@@ -33,31 +33,26 @@
"Topic :: Internet :: WWW/HTTP :: HTTP Servers",
"Topic :: Scientific/Engineering :: Bio-Informatics",
"License :: OSI Approved :: Apache Software License",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
],
install_requires=[
"asyncpg==0.25.0",
"aiohttp==3.8.1",
"Authlib==0.15.5",
"aiohttp-cors==0.7.0",
"jsonschema==3.2.0; python_version < '3.7'",
"jsonschema==4.3.2; python_version >= '3.7'",
"jsonschema==4.3.2",
"gunicorn==20.1.0",
"uvloop==0.14.0; python_version < '3.7'",
"uvloop==0.16.0; python_version >= '3.7'",
"cyvcf2==0.10.1; python_version < '3.7'",
"cyvcf2; python_version >= '3.7'",
"uvloop==0.16.0",
"cyvcf2==0.30.14",
"aiocache==0.11.1",
"aiomcache==0.6.0",
"ujson==4.3.0; python_version < '3.7'",
"ujson==5.1.0; python_version >= '3.7'",
"ujson==5.1.0",
],
extras_require={
"vcf": [
"cyvcf2==0.10.1; python_version < '3.7'",
"numpy==1.21.5",
"cyvcf2; python_version >= '3.7'",
"cyvcf2==0.30.14",
"Cython==0.29.26",
],
"test": [
5 changes: 2 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py{36,38},flake8,docs,bandit,unit_tests,mypy, black
envlist = flake8,docs,bandit,unit_tests,mypy
skipsdist = True

[flake8]
@@ -56,5 +56,4 @@ commands = py.test -x --cov=beacon_api tests/ --cov-fail-under=80

[gh-actions]
python =
3.6: unit_tests
3.8: flake8, black, unit_tests, docs, bandit, mypy
3.8: flake8, unit_tests, docs, bandit, mypy