Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#48] update for 2020 #49

Merged
merged 3 commits into from May 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions Dockerfile
@@ -1,15 +1,14 @@
FROM ubuntu:latest
FROM ubuntu:bionic

ENV DEBIAN_FRONTEND=noninteractive

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 && \
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion procbuild/__init__.py
Expand Up @@ -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)))
6 changes: 3 additions & 3 deletions 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
2 changes: 1 addition & 1 deletion runserver.py
Expand Up @@ -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'))

Expand Down