Skip to content

pin baselayer (logging) & update travis scripts #61

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

pin baselayer (logging) & update travis scripts #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
648b0c1
pin_logging
profjsb Sep 30, 2020
8631594
remove specified linux distro
profjsb Sep 30, 2020
dffc4bf
update npm
profjsb Sep 30, 2020
d8ad384
remove xvfb
profjsb Sep 30, 2020
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
3 changes: 1 addition & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@


language: python
dist: trusty
sudo: required
cache:
# See http://docs.travis-ci.com/user/caching/#pip-cache
Expand All @@ -62,7 +61,7 @@ addons:

matrix:
include:
- python: 3.6
- python: 3.7
env:
- TEST_TARGET=test

Expand Down
2 changes: 1 addition & 1 deletion .travis/travis_install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ hash -d pip # find upgraded pip
section_end "install.base.requirements"

section "install.baselayer.requirements"
npm -g install npm@4.2.0
npm -g install npm@5.8.0
npm --version
node --version

Expand Down
2 changes: 1 addition & 1 deletion baselayer
Open in desktop
Submodule baselayer updated 60 files
+7 −1 .gitignore
+1 −1 .travis.yml
+20 −10 Makefile
+9 −1 app/access.py
+6 −10 app/app_server.py
+14 −6 app/config.py
+1 −2 app/custom_exceptions.py
+16 −4 app/env.py
+13 −9 app/flow.py
+85 −48 app/handlers/base.py
+1 −0 app/handlers/mainpage.py
+12 −6 app/handlers/socket_auth.py
+8 −3 app/json_util.py
+1 −1 app/model_util.py
+290 −58 app/models.py
+4 −6 app/psa.py
+123 −26 app/test_util.py
+0 −65 conf/supervisor/supervisor.conf.template
+31 −2 config.yaml.defaults
+79 −72 doc/conf.py
+0 −4 doc/dev.md
+43 −4 doc/usage.md
+13 −3 log.py
+6 −3 requirements.txt
+0 −31 services/app.py
+45 −0 services/app/app.py
+7 −0 services/app/supervisor.conf.template
+3 −2 services/cron/cron.py
+7 −0 services/cron/supervisor.conf
+11 −0 services/dask/supervisor.conf.template
+111 −0 services/external_logging/external_logging.py
+5 −0 services/external_logging/supervisor.conf
+8 −8 services/fake_oauth2/fake_oauth2.py
+5 −0 services/fake_oauth2/supervisor.conf
+4 −1 services/message_proxy/message_proxy.py
+5 −0 services/message_proxy/supervisor.conf
+8 −1 services/nginx/nginx.conf.template
+2 −0 services/nginx/supervisor.conf
+0 −37 services/webpack.py
+9 −0 services/webpack/supervisor.conf
+33 −0 services/webpack/webpack.py
+5 −0 services/websocket_server/supervisor.conf
+41 −36 services/websocket_server/websocket_server.py
+38 −40 static/js/API.js
+4 −2 static/js/MessageHandler.js
+55 −58 static/js/components/Notifications.jsx
+61 −66 static/js/components/WebSocket.jsx
+6 −6 static/js/cookies.js
+273 −243 static/js/reconnecting-websocket.js
+24 −22 tools/check_app_environment.py
+66 −47 tools/db_init.py
+4 −1 tools/env_summary.py
+2 −0 tools/fill_conf_values.py
+8 −3 tools/pip_install_requirements.py
+61 −0 tools/setup_services.py
+1 −2 tools/silent_monitor.py
+1 −0 tools/status.py
+3 −2 tools/supervisor_status.py
+55 −25 tools/test_frontend.py
+17 −11 tools/watch_logs.py