diff --git a/.travis.yml b/.travis.yml index c41b006..4cf8e6e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ python: install: - pip install --upgrade setuptools pip - pip install -r requirements.txt - - pip install -r <(curl --silent https://raw.githubusercontent.com/scipy-conference/scipy_proceedings/2019/requirements.txt) + - pip install -r <(curl --silent https://raw.githubusercontent.com/scipy-conference/scipy_proceedings/2020/requirements.txt) script: - pytest diff --git a/Dockerfile b/Dockerfile index 638d31c..d15cebb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:latest +FROM ubuntu:bionic ENV DEBIAN_FRONTEND=noninteractive @@ -6,10 +6,9 @@ ENV UID_PROCBUILD=1002 ENV GID_PROCBUILD=1006 RUN apt-get update && \ - apt-get install -y python3.6 python3.6-venv git curl \ + apt-get install -y python3.6 python3-venv git curl \ texlive-latex-base texlive-publishers texlive-fonts-recommended \ texlive-latex-extra texlive-bibtex-extra && \ - apt-get install -y python3-venv && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ groupadd -g ${GID_PROCBUILD} procbuild && \ @@ -28,7 +27,7 @@ RUN bash -c "python3.6 -m venv /procbuild_env && \ RUN bash -c "source /procbuild_env/bin/activate && \ pip install --upgrade pip && \ pip install -r requirements.txt && \ - pip install -r <(curl --silent https://raw.githubusercontent.com/scipy-conference/scipy_proceedings/2019/requirements.txt)" + pip install -r <(curl --silent https://raw.githubusercontent.com/scipy-conference/scipy_proceedings/2020/requirements.txt)" USER procbuild diff --git a/README.md b/README.md index 5000aaf..bf0b529 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ This includes some packages on pypi which we'll install with `pip`. The easiest way to do this is by pulling down the latest version of the file with `curl`: ``` -pip install -r <(curl https://raw.githubusercontent.com/scipy-conference/scipy_proceedings/2019/requirements.txt) +pip install -r <(curl https://raw.githubusercontent.com/scipy-conference/scipy_proceedings/2020/requirements.txt) ``` Additionally, you will need to install a version of LaTeX and some external diff --git a/procbuild/__init__.py b/procbuild/__init__.py index 0cc7f27..8e6a4db 100644 --- a/procbuild/__init__.py +++ b/procbuild/__init__.py @@ -2,5 +2,5 @@ package_path = os.path.abspath(os.path.dirname(__file__)) -MASTER_BRANCH = os.environ.get('MASTER_BRANCH', '2019') +MASTER_BRANCH = os.environ.get('MASTER_BRANCH', '2020') ALLOW_MANUAL_BUILD_TRIGGER = bool(int(os.environ.get('ALLOW_MANUAL_BUILD_TRIGGER', 1))) diff --git a/requirements.txt b/requirements.txt index 900ce35..63fd387 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -Flask==0.12.2 -waitress==1.0.2 -urllib3==1.22 +Flask==1.0 +waitress==1.4.2 +urllib3==1.25.5 pyzmq==17.0.0 pytest==3.4.2 diff --git a/runserver.py b/runserver.py index ebd175a..e2bc5ef 100755 --- a/runserver.py +++ b/runserver.py @@ -6,7 +6,7 @@ from waitress import serve # -- SERVER CONFIGURATION -- (can be overridden from shell) -config = (('MASTER_BRANCH', '2019'), +config = (('MASTER_BRANCH', '2020'), ('ALLOW_MANUAL_BUILD_TRIGGER', '1'), ('PORT', '7001'))