Skip to content
Snippets Groups Projects
Commit b97592f7 authored by Jeremy M Fee's avatar Jeremy M Fee
Browse files

Merge branch 'pipfile-update' into 'master'

Update uvicorn to install standard extras, use python3.7 in docker

See merge request !35
parents dbc5d11d 5b332ab8
No related branches found
No related tags found
2 merge requests!146Release CMO metadata to production,!35Update uvicorn to install standard extras, use python3.7 in docker
Pipeline #22793 passed
......@@ -28,7 +28,7 @@ RUN echo 'export PATH=/conda/bin:$PATH' > /etc/profile.d/conda.sh \
# install dependencies via conda
RUN conda config --set ssl_verify $SSL_CERT_FILE \
&& conda config --add channels conda-forge \
&& conda install --yes jupyter obspy pycurl \
&& conda install --yes python=3.7 jupyter obspy pycurl \
&& conda clean --all -y \
&& export PIP_CERT=$SSL_CERT_FILE \
&& pip install pipenv 'virtualenv!=20.0.22' \
......
......@@ -17,10 +17,13 @@ numpy = "*"
scipy = "*"
obspy = "*"
pycurl = "==7.43.0.5"
# web service dependencies
authlib = "*"
cryptography = "*"
databases = {extras = ["postgresql", "sqlite"],version = "*"}
databases = {extras=["postgresql", "sqlite"], version = "*"}
fastapi = "*"
gunicorn = "*"
httpx = "==0.11.1"
openpyxl = "*"
pydantic = "*"
......@@ -28,8 +31,7 @@ sqlalchemy = "*"
sqlalchemy-utc = "*"
typing = "*"
typing-extensions = "*"
uvicorn = "*"
gunicorn = "*"
uvicorn = {extras=["standard"], version="*"}
[pipenv]
allow_prereleases = true
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment