Skip to content
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

Obsolete flask #35

Closed
wants to merge 3 commits into from
Closed

Obsolete flask #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
156a02b
Fix for the "'tuple' object has no attribute 'safe_load'" error
Nov 15, 2023
95a4e17
Force old verison of Flask compatible with Daniels code
Nov 16, 2023
9c98d84
Forced a lot of python modules to specific obsolete verstions to be c…
Nov 16, 2023
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
11 changes: 7 additions & 4 deletions eidaws.stationlite/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,19 @@ def get_version(filename):
"cached-property>=1.5.1",
"eidaws.utils==0.1",
"fasteners>=0.14.1",
"Flask>=0.12.2",
"Flask-CORS>=3.0.10",
"Flask-SQLAlchemy>=2.3.2",
"Flask==2.1.1",
"Flask-CORS==3.0.10",
"Flask-SQLAlchemy==2.5.1",
"Jinja2==3.1.1",
"MarkupSafe==2.1.1",
"Werkzeug==2.1.1",
"importlib_metadata==3.0.0;python_version<'3.8'",
"jsonschema>=3.2.0",
"lxml>=4.2.0",
"obspy>=1.2.1",
"pyyaml>=5.3",
"requests>=2.18.4",
"SQLAlchemy>=1.4.5",
"SQLAlchemy==1.4.35",
]
_EXTRAS = {"postgres": ["psycopg2"]}
_ENTRY_POINTS = {
Expand Down
5 changes: 3 additions & 2 deletions eidaws.utils/eidaws/utils/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import os
import sys


import configargparse

from eidaws.utils.config import interpolate_environment_variables
Expand Down Expand Up @@ -92,10 +93,10 @@ def _parse_section(self, parsed_obj, section, stream):
return interpolated[section]

def parse(self, stream):
yaml = self._load_yaml()
yaml, SafeLoader, _ = self._load_yaml()

try:
parsed_obj = yaml.safe_load(stream)
parsed_obj = yaml.load(stream, Loader=SafeLoader)
except Exception as e:
raise configargparse.ConfigFileParserException(
"Couldn't parse config file: %s" % e
Expand Down
Loading