Skip to content

Dependabot suggested dependency upgrades #118

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
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
308 changes: 270 additions & 38 deletions frontend/v1/package-lock.json

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions frontend/v1/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chimbuko-vis",
"version": "3.0.0",
"version": "3.0.1",
"description": "Front-end package of Chimbuko visualization",
"main": "index.js",
"scripts": {
Expand All @@ -9,7 +9,7 @@
"dev-build": "webpack --mode development --progress --config webpack.config.js",
"watch": "webpack --mode development --progress --config webpack.config.js --watch"
},
"author": "Sungsoo Ha, Wei Xu",
"author": "David Dakota Blair, Sungsoo Ha, Wei Xu",
"license": "ISC",
"devDependencies": {
"babel-core": "^6.26.3",
Expand All @@ -26,16 +26,19 @@
"webpack-cli": "^5.1.4"
},
"dependencies": {
"@babel/runtime": "^7.27.6",
"@material-ui/core": "^4.4.0",
"@material-ui/icons": "^4.2.1",
"@material-ui/lab": "^4.0.0-alpha.29",
"@material-ui/styles": "^4.3.3",
"axios": "^1.8.4",
"brace-expansion": "^1.1.12",
"chart.js": "^2.9.4",
"chartjs-plugin-streaming": "1.8.0",
"chartjs-plugin-zoom": "^0.7.7",
"clsx": "^1.0.4",
"d3": "^5.12.0",
"form-data": "^4.0.4",
"history": "^4.9.0",
"moment": "^2.29.4",
"ncp": "^2.0.0",
Expand Down
9 changes: 6 additions & 3 deletions manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
from gevent import monkey
monkey.patch_all()

import types
import collections
import os
import subprocess
import sys
import os
import types

# monkey patch flask to support old version of flask_script
import flask
Expand All @@ -16,7 +17,9 @@
_compat.text_type = str
sys.modules[module_name] = _compat
setattr(flask, '_compat', _compat)
flask._request_ctx_stack = None
mock_request_ctx_stack = collections.namedtuple("mock", ["top"])
mock_request_ctx_stack.top = collections.namedtuple("top", ["app"])
flask._request_ctx_stack = mock_request_ctx_stack

from flask_script import Manager, Command, Server as _Server, Option

Expand Down
14 changes: 7 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Cython==3.0.4
dnspython==2.6.1
flask==3.0.3
Flask-Script==2.0.6
Flask-SocketIO==2.9.6
Flask-SQLAlchemy==2.5.1
Flask-SocketIO==5.5.1
Flask-SQLAlchemy==3.1.1
flit_core==3.9.0
gevent==24.2.1
greenlet==2.0.2
Expand All @@ -25,15 +25,15 @@ MarkupSafe==2.1.5
pkgconfig==1.5.5
pybind11==2.13.4
pycparser==2.21
python-engineio==4.10.1
python-socketio==5.11.4
python-engineio==4.12.2
python-socketio==5.13.0
pytz==2023.3
redis==4.5.4
requests==2.32.3
requests==2.32.4
runstats==1.8.0
six==1.16.0
SQLAlchemy==1.4.45
urllib3==1.26.19
SQLAlchemy==2.0.41
urllib3==2.2.3
vine==5.1.0
werkzeug==3.0.6
zipp==3.20
Expand Down
16 changes: 15 additions & 1 deletion server/server.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import json
import os

from flask import (
Blueprint,
Response,
Expand All @@ -13,6 +16,15 @@
main = Blueprint('main', __name__)


@main.route('/build')
def build():
with open("./frontend/v1/package.json") as f:
npm_package = json.load(f)
return jsonify({
"npm_package_version": npm_package["version"]
})


@main.before_app_request
def before_request():
"""Update requests per second stats."""
Expand All @@ -23,6 +35,8 @@ def before_request():
def stop():
import time

global pdb

def get_inspect():
from requests import get
resp = get(current_app.url_for('tasks.get_info', _external=True))
Expand Down Expand Up @@ -63,7 +77,7 @@ def get_inspect():
socketio.stop()
print("Shutting down SocketIO web server!")

if pdb:
if 'pdb' in globals():
del pdb
print("Shutting down provdb!")

Expand Down
11,948 changes: 1 addition & 11,947 deletions server/static/js/bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion server/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
except ImportError: # pragma: no cover
from cStringIO import StringIO as BytesIO

from flask import Blueprint, abort, current_app, g, request
from flask import Blueprint, Flask, abort, current_app, g, request
from werkzeug.exceptions import InternalServerError
from celery import states

Expand Down
2 changes: 1 addition & 1 deletion webserver/run_webserver.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ else
fi

echo "create db ..."
python3.8 manager.py createdb
python3.8 manager.py createdb &

echo "run redis ..."
webserver/run-redis.sh &
Expand Down