Skip to content

Commit 9380803

Browse files
committed
Upgrading to python 3.8, nodejs 10.x and fixing docker build
1 parent c69ba3c commit 9380803

File tree

7 files changed

+26
-20
lines changed

7 files changed

+26
-20
lines changed

.dockerignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Dockerfile
2+
.gitignore

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ __pycache__/
99
# Distribution / packaging
1010
.Python
1111
env/
12+
venv/
1213
build/
1314
develop-eggs/
1415
dist/

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.3.1
1+
10

.pylintrc

+3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ disable =
1212
bad-continuation,
1313
too-few-public-methods,
1414
global-statement,
15+
unnecessary-comprehension,
16+
import-outside-toplevel,
1517
cyclic-import,
18+
no-else-continue,
1619
locally-disabled,
1720
file-ignored
1821

Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.6-stretch
1+
FROM python:3.8-buster
22
MAINTAINER Devin Matte <[email protected]>
33

44
RUN mkdir /opt/conditional
@@ -8,15 +8,15 @@ ADD requirements.txt /opt/conditional
88
WORKDIR /opt/conditional
99

1010
RUN apt-get -yq update && \
11-
apt-get -yq install libsasl2-dev libldap2-dev libssl-dev && \
11+
apt-get -yq install libsasl2-dev libldap2-dev libssl-dev gcc g++ make && \
1212
pip install -r requirements.txt && \
1313
apt-get -yq clean all
1414

1515
ADD . /opt/conditional
1616

17-
RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
17+
RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
1818
apt-get -yq update && \
19-
apt-get -yq install nodejs npm && \
19+
apt-get -yq install nodejs && \
2020
npm install && \
2121
npm run production && \
2222
rm -rf node_modules && \

package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
},
1414
"author": "Computer Science House",
1515
"engines": {
16-
"node": ">=0.12.0 ~5.9.0",
17-
"npm": ">=2.14.12 ~3.7.3"
16+
"node": ">=10.23.0",
17+
"npm": ">=6.14.8"
1818
},
1919
"scripts": {
2020
"start": "gulp",
@@ -27,7 +27,7 @@
2727
"dependencies": {
2828
"bootstrap": "^3.3.6",
2929
"bootstrap-material-datetimepicker": "https://github.com/T00rk/bootstrap-material-datetimepicker.git#gh-pages",
30-
"bootstrap-sass": "^3.3.6",
30+
"bootstrap-sass": "^3.4.1",
3131
"bootstrap-sweetalert": "^1.0.1",
3232
"csh-material-bootstrap": "1.0.0",
3333
"datatables.net": "^1.10.12",
@@ -73,8 +73,8 @@
7373
"gulp-rev": "7.1.0",
7474
"gulp-rev-napkin": "0.1.0",
7575
"gulp-rev-replace": "0.4.3",
76-
"gulp-sass": "2.3.2",
77-
"gulp-sass-lint": "^1.2.0",
76+
"gulp-sass": "^3.2.1",
77+
"gulp-sass-lint": "^1.4.0",
7878
"gulp-sequence": "0.4.5",
7979
"gulp-sizereport": "1.1.3",
8080
"gulp-sourcemaps": "1.6.0",
@@ -89,8 +89,8 @@
8989
"object-assign": "4.1.0",
9090
"open": "0.0.5",
9191
"pretty-hrtime": "1.0.2",
92-
"raven-js": "^3.9.2",
93-
"require-dir": "0.3.0",
92+
"raven-js": "^3.27.2",
93+
"require-dir": "1.2.0",
9494
"sinon": "1.17.4",
9595
"sinon-chai": "2.8.0",
9696
"webpack": "1.13.1",

requirements.txt

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
alembic~=0.9.8
2-
astroid~=2.2.5
2+
astroid~=2.4.0
33
blinker~=1.4
44
click~=6.7
55
csh_ldap>=2.3.1
@@ -12,20 +12,20 @@ gunicorn~=19.7.1
1212
isort~=4.3.4
1313
itsdangerous~=0.24
1414
Jinja2~=2.10
15-
lazy-object-proxy~=1.3.1
15+
lazy-object-proxy~=1.4.0
1616
Mako~=1.0.7
1717
MarkupSafe~=1.0
1818
mccabe~=0.6.1
1919
oic~=0.11.0
2020
psycopg2~=2.8.5
2121
pyldap~=2.4.45
22-
pylint~=2.3.1
22+
pylint~=2.6.0
2323
python-dateutil~=2.6.1
2424
python-editor~=1.0.3
25-
raven~=6.6.0
26-
sentry-sdk[flask]~=0.13.1
27-
six~=1.11.0
28-
SQLAlchemy~=1.3.7
25+
raven~=6.10.0
26+
sentry-sdk[flask]~=0.19.5
27+
six~=1.12.0
28+
SQLAlchemy~=1.3.22
2929
structlog~=18.1.0
3030
Werkzeug~=0.15.3
31-
wrapt~=1.10.11
31+
wrapt~=1.11.0

0 commit comments

Comments
 (0)