Commit ec93c952 authored by liadomide's avatar liadomide

TVB-2593 keep only the WSGIServer alternative

parent 8aec4f55
......@@ -44,8 +44,8 @@ VERSION = "2.0a1"
TVB_TEAM = "Mihai Andrei, Lia Domide, Stuart Knock, Bogdan Neacsa, Paula Popa, Paula Sansz Leon, Marmaduke Woodman"
TVB_INSTALL_REQUIREMENTS = ["allensdk", "BeautifulSoup4", "cherrypy", "flask", "flask-restplus", "formencode", "Jinja2",
"h5py", "networkx", "nibabel", "numpy", "Pillow", "psutil", "scipy",
TVB_INSTALL_REQUIREMENTS = ["allensdk", "BeautifulSoup4", "cherrypy", "flask", "flask-restplus", "formencode",
"gevent", "h5py", "Jinja2", "networkx", "nibabel", "numpy", "Pillow", "psutil", "scipy",
"simplejson", "sqlalchemy", "sqlalchemy-migrate", "tvb-data", "tvb-gdist", "tvb-library"]
# Packaging tvb-framework with REST server inside
......
......@@ -56,7 +56,6 @@ LOGGER.info("TVB application will be running using encoding: " + sys.getdefaulte
FLASK_PORT = 9090
os.environ['FLASK_ENV'] = 'development'
def initialize_tvb(arguments):
......@@ -133,11 +132,8 @@ def initialize_flask():
api.add_namespace(name_space_operations)
api.add_namespace(name_space_simulation)
if TvbProfile.env.is_distribution():
http_server = WSGIServer(("0.0.0.0", FLASK_PORT), app)
http_server.serve_forever()
else:
app.run(host="0.0.0.0", debug=True, port=FLASK_PORT)
http_server = WSGIServer(("0.0.0.0", FLASK_PORT), app)
http_server.serve_forever()
if __name__ == '__main__':
......
......@@ -13,7 +13,7 @@ RUN conda update -n base -c defaults conda
RUN conda create -y --name tvb-docs python=3.7 nomkl numba scipy numpy networkx scikit-learn cython pip numexpr psutil
RUN conda install -y --name tvb-docs pytest pytest-cov pytest-benchmark pytest-mock matplotlib
RUN conda install -y --name tvb-docs psycopg2 pytables scikit-image==0.14.2 simplejson cherrypy docutils
RUN conda install -y --name tvb-docs -c conda-forge jupyterlab flask
RUN conda install -y --name tvb-docs -c conda-forge jupyterlab flask gevent
RUN /opt/conda/envs/tvb-docs/bin/pip install --upgrade pip
RUN /opt/conda/envs/tvb-docs/bin/pip install h5py>=2.10 formencode cfflib jinja2 nibabel sqlalchemy==1.1.14 sqlalchemy-migrate==0.11.0 allensdk BeautifulSoup4 subprocess32 flask-restplus
RUN /opt/conda/envs/tvb-docs/bin/pip install tvb-gdist typing sphinx==1.2.3 docutils==0.12
......@@ -21,7 +21,7 @@ RUN /opt/conda/envs/tvb-docs/bin/pip install tvb-gdist typing sphinx==1.2.3 docu
RUN conda create -y --name tvb-run python=3.7 nomkl numba scipy numpy networkx scikit-learn cython pip numexpr psutil
RUN conda install -y --name tvb-run pytest pytest-cov pytest-benchmark pytest-mock matplotlib
RUN conda install -y --name tvb-run psycopg2 pytables scikit-image==0.14.2 simplejson cherrypy docutils
RUN conda install -y --name tvb-run -c conda-forge jupyterlab flask
RUN conda install -y --name tvb-run -c conda-forge jupyterlab flask gevent
RUN /opt/conda/envs/tvb-run/bin/pip install --upgrade pip
RUN /opt/conda/envs/tvb-run/bin/pip install h5py>=2.10 formencode cfflib jinja2 nibabel sqlalchemy==1.1.14 sqlalchemy-migrate==0.11.0 allensdk BeautifulSoup4 subprocess32 flask-restplus
RUN /opt/conda/envs/tvb-run/bin/pip install tvb-gdist typing
......@@ -42,7 +42,7 @@ RUN wget https://zenodo.org/record/3497545/files/tvb_data_2_0_1.zip?download=1 -
# make sure a copy of tvb-root exists inside, for users without Github clone
RUN git clone --depth 1 https://github.com/the-virtual-brain/tvb-root.git; \
cd tvb-root/tvb_build; \
y cd tvb-root/tvb_build; \
/bin/bash -c "source activate tvb-run && /bin/bash install_full_tvb.sh"; \
/bin/bash -c "source activate tvb-docs && /bin/bash install_full_tvb.sh"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment