Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ before_install:
- ulimit -n 4096 # Increase open file limit

install:
- pip install "PyYAML==5.3.1"
- pip install awscli==1.18.66
- pip install "cfn-lint<0.79"

jobs:
fast_finish: true
Expand Down
3 changes: 3 additions & 0 deletions constraints.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Global dependency constraints for CI & Docker
PyYAML<6
cfn-lint<0.79
6 changes: 4 additions & 2 deletions docker/dev/django/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ ENV PIP_DISABLE_PIP_VERSION_CHECK=on

RUN mkdir /code
WORKDIR /code

ADD constraints.txt /code/
ADD requirements/* /code/
RUN pip install --no-cache-dir --no-compile --progress-bar off -r dev.txt
RUN pip install --no-cache-dir --no-compile --progress-bar off \
-c constraints.txt \
-r dev.txt

ADD . /code/

Expand Down
6 changes: 4 additions & 2 deletions docker/dev/worker_py3_7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ RUN mkdir /code
WORKDIR /code

ADD requirements/* /code/
ADD constraints.txt /code/

RUN pip install -U cffi service_identity cython==0.29 setuptools==57.5.0
RUN pip install -r dev.txt
RUN pip install -r worker_py3_7.txt
RUN pip install -c constraints.txt -r dev.txt
RUN pip install -c constraints.txt -r worker_py3_7.txt


ADD . /code

Expand Down
6 changes: 3 additions & 3 deletions docker/dev/worker_py3_8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ ENV PYTHONUNBUFFERED 1

RUN mkdir /code
WORKDIR /code
ADD constraints.txt /code/

ADD requirements/* /code/
RUN pip install -r dev.txt

RUN pip install -c constraints.txt -r dev.txt
RUN apt-get update && \
apt-get --no-install-recommends install -q -y default-jre default-jdk \
git cmake libeigen3-dev libboost-python-dev libopencv-dev python3-opencv \
libgmp-dev libcgal-qt5-dev swig && \
rm -rf /var/lib/apt/lists/*

RUN pip install -U cffi service_identity cython==0.29 setuptools==57.5.0
RUN pip install -r worker_py3_8.txt
RUN pip install -c constraints.txt -r worker_py3_8.txt

ADD . /code

Expand Down
5 changes: 3 additions & 2 deletions docker/dev/worker_py3_9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ RUN apt-get update && \

RUN mkdir /code
WORKDIR /code
ADD constraints.txt /code/

ADD requirements/* /code/

RUN pip install -r dev.txt
RUN pip install -r worker_py3_9.txt
RUN pip install -c constraints.txt -r dev.txt
RUN pip install -c constraints.txt -r worker_py3_9.txt

ADD . /code

Expand Down
2 changes: 1 addition & 1 deletion requirements/common.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ proc==1.0
psycopg2==2.8.4
pycurl==7.43.0.6
PyJWT==2.1.0
PyYaml==5.1
PyYAML>=3.10,<6
rstr==2.2.6
sendgrid==6.4.8
vine==1.3.0
3 changes: 2 additions & 1 deletion requirements/worker_py3_9.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
matplotlib==3.8.4
cfn-lint==0.79.5
cfn-lint==0.48.3
PyYAML>=3.10,<6
networkx==3.2.1
numpy==1.26.4
pandas==2.2.3
Expand Down
12 changes: 10 additions & 2 deletions scripts/seed.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,19 @@


def check_database():
if len(EmailAddress.objects.all()) > 0:
if EmailAddress.objects.exists():
print(
"Are you sure you want to wipe the existing development database and reseed it? (Y/N)"
)
if settings.TEST or input().lower() == "y":
try:
user_input = input().lower()
except EOFError:
print(
"Non-interactive environment detected. Skipping database reseeding."
)
return False

if settings.TEST or user_input == "y":
destroy_database()
return True
else:
Expand Down