Skip to content

Commit

Permalink
build: update requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
aszs committed Oct 30, 2024
1 parent 33ce48b commit 2909b0f
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 13 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dynamic = ["readme", "dependencies", "optional-dependencies", "version"]

[build-system]
requires = [
"setuptools>=61.0.0",
"setuptools>=70.0.0",
"wheel",
"setuptools-rust>=1.7.0",
"pbr",
Expand Down
6 changes: 2 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ GitPython==3.1.41; python_version>='3.7' # BSD
rich==12.4.4 # MIT
rich-click>=1.8.0 # MIT
# the following are all Apache 2.0 (note: don't put comments on -r lines)
itsdangerous==2.0.1 # newer version broken with moto (using old flask)
MarkupSafe<=2.1.1 # newer version broken with jinja2
jinja2==3.1.3 # BSD 3-clause
typing_extensions>=4.7
flask<=2.1.3 # BSD 3-clause
flask==2.3.3 # BSD 3-clause
flask-caching<=2.0.1 # BSD 3-clause
flask_cors==3.0.10
werkzeug==2.2.3 # needed by flask 2.1 (which is needed by moto) (later versions of werkzeug hang tests)
flask_cors==5.0.0
uvicorn<=0.18.2 # BSD 3-clause
python-gitlab==3.13.0
tosca>=0.0.8
Expand Down
2 changes: 1 addition & 1 deletion server-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
gunicorn==20.1.0
gunicorn==22.0.0
redis==4.3.5
2 changes: 1 addition & 1 deletion tosca-package/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ classifiers = [
dependencies = [
"black>=24.3.0",
"typing_extensions>=4.7.1",
"RestrictedPython>=7.0",
"RestrictedPython>=7.4",
]

[build-system]
Expand Down
8 changes: 2 additions & 6 deletions unfurl/server/serve.py
Original file line number Diff line number Diff line change
Expand Up @@ -1256,12 +1256,8 @@ def json_response(obj, pretty, **dump_args):
else:
dump_args.setdefault("separators", (",", ":"))

dumps = flask.json.dumps
mimetype = current_app.config["JSONIFY_MIMETYPE"]
# XXX in flask 2.2+:
# dumps = current_app.json.dumps
# mimetype= current_app.json.mimetype
return current_app.response_class(f"{dumps(obj, **dump_args)}\n", mimetype=mimetype)
dumps = current_app.json.dumps
return current_app.response_class(f"{dumps(obj, **dump_args)}\n", mimetype="application/json")


# /export?format=environments&include_all_deployments=true&latest_commit=foo&project_id=bar&branch=main
Expand Down

0 comments on commit 2909b0f

Please sign in to comment.