From 1874addb60e608f3656f19199cb43c74b1d5d58b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Robles?= Date: Mon, 20 Feb 2023 17:58:11 -0500 Subject: [PATCH] Updates (#60) (#61) * wip * wip * wip * wip * wip * wip * wip * wip --- frestq/app.py | 2 +- frestq/frestq_app.py | 2 +- requirements.txt | 12 ++++++------ setup.py | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/frestq/app.py b/frestq/app.py index 99bb16a..42e7276 100755 --- a/frestq/app.py +++ b/frestq/app.py @@ -44,7 +44,7 @@ def get_json(self, force=False, silent=False, cache=True): if not (force or self.is_json): return None - data = self._get_data_for_json(cache=cache) + data = self.get_data(cache=cache) try: rv = loads(data.decode('utf-8')) diff --git a/frestq/frestq_app.py b/frestq/frestq_app.py index 0fe35a5..9e99b46 100644 --- a/frestq/frestq_app.py +++ b/frestq/frestq_app.py @@ -41,7 +41,7 @@ def get_json(self, force=False, silent=False, cache=True): if not (force or self.is_json): return None - data = self._get_data_for_json(cache=cache) + data = self.get_data(cache=cache) try: rv = loads(data.decode('utf-8')) diff --git a/requirements.txt b/requirements.txt index 70c110e..11f4dbb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,17 +4,17 @@ apscheduler==3.7.0 requests==2.22.0 -Flask==1.0.0 -Flask-SQLAlchemy==2.4.4 -Jinja2==2.11.3 -MarkupSafe==0.23 +Flask==2.0.3 +Flask-SQLAlchemy==2.5.1 +Jinja2==3.1.2 +MarkupSafe==2.1.1 SQLAlchemy==1.3.23 -Werkzeug==1.0.1 +Werkzeug==2.2.3 argparse==1.2.1 cffi==1.14.4 ipdb==0.13.9 ipython==8.10.0 -itsdangerous==0.24 +itsdangerous==2.0 prettytable==0.7.2 pycparser==2.10 uwsgi==2.0.18 diff --git a/setup.py b/setup.py index 8cb9af1..ab265e8 100644 --- a/setup.py +++ b/setup.py @@ -18,17 +18,17 @@ install_requires=[ 'apscheduler==3.7.0', 'requests==2.22.0', - 'Flask==1.0.0', - 'Flask-SQLAlchemy==2.4.4', - 'Jinja2==2.11.3', - 'MarkupSafe==0.23', + 'Flask==2.0.3', + 'Flask-SQLAlchemy==2.5.1', + 'Jinja2==3.1.2', + 'MarkupSafe==2.1.1', 'SQLAlchemy==1.3.23', - 'Werkzeug==1.0.1', + 'Werkzeug==2.2.3', 'argparse==1.2.1', 'cffi==1.14.4', 'ipdb==0.13.9', 'ipython==8.10.0', - 'itsdangerous==0.24', + 'itsdangerous==2.0', 'prettytable==0.7.2', 'pycparser==2.10', 'uwsgi==2.0.18',