diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000000000000000000000000000000000000..6404832a479b08ead01393d3d75ec6ed3855b31b --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,3 @@ +graft covid19/static +graft covid19/templates +global-exclude *.pyc \ No newline at end of file diff --git a/config.py b/config.py index b56c00dd3cd0757166f90b3442db93a8af592098..d065cb831c010fc46cb5001569ca77918715fc5a 100644 --- a/config.py +++ b/config.py @@ -8,3 +8,4 @@ SECRET_KEY='vfdjv423ndf654&%%' APP_DEBUGGER_ACTIVE = True CELERY_CONF_WORKER_SEND_TASK_EVENTS = True CELERY_CONF_TASK_SEND_SENT_EVENT = True +PORT = 9090 diff --git a/covid19/__init__.py b/covid19/__init__.py index 5f450b30d4058f0af2641b2e1c7efba29d5ff34f..758c134311bf2827535bb0b9536af445fbd53797 100644 --- a/covid19/__init__.py +++ b/covid19/__init__.py @@ -1,4 +1,4 @@ -from database import app, run_run_with_debug +from database import app, run_run_with_debug, port import covid19.views @@ -13,4 +13,4 @@ if __name__ == '__main__': app.logger.info("# Covid19 Data - WEB #") app.logger.info("#############################################################") app.logger.info(" ") - app.run(debug=run_run_with_debug) + app.run(debug=run_run_with_debug, port=port) diff --git a/database.py b/database.py index b0062d5bb2c56c580cddaefc046c1a940339f45c..63948271f84ef9ba550a6d69c4ae886feffcb81a 100644 --- a/database.py +++ b/database.py @@ -7,6 +7,7 @@ from logging.config import dictConfig app = Flask('app') CORS(app) app.config.from_object("config") +port = app.config['PORT'] ITEMS_PER_PAGE = app.config['ITEMS_PER_PAGE'] DB_URL = 'postgresql+psycopg2://{user}:{pw}@{url}/{db}'.format( user=app.config['POSTGRES_USER'], diff --git a/run_web.sh b/run_web.sh index d2e5e485830b6aaa89730bd33f21bd41f92ba798..eef92e0645c73c7310d2ed2da23af38f6a5a1af8 100755 --- a/run_web.sh +++ b/run_web.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash +. venv/bin/activate #export FLASK_ENV=development #export FLASK_APP=covid19python #pip install -e . #flask run -. venv/bin/activate -python covid19 + +python covid19.__init__ diff --git a/setup.py b/setup.py index de10179b2e4a30a654be1c9c8c5ab9e9905c9570..8255c9d26ccc51c3be8732d0e0a0ac9d7b023c93 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup, find_packages +from setuptools import find_packages, setup setup( name='covid19python',