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.

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

Upgraded flask package and dependencies #68

Merged
merged 25 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ea22c18
upgraded flask package and dependencies
Sachinbisht27 Jan 9, 2024
6b62702
fixed the pre-commit error
Sachinbisht27 Jan 10, 2024
1217c65
Fixes the issues raised for the upgarded packages
Sachinbisht27 Jan 10, 2024
4b56381
Updated branch for staging build
Sachinbisht27 Jan 10, 2024
a5be2fb
added function framework in requirements
Sachinbisht27 Jan 10, 2024
2941ee9
removed function framework from requirements
Sachinbisht27 Jan 10, 2024
1970354
removed function framework from requirements
Sachinbisht27 Jan 10, 2024
d29c1b8
downgraded the flask version
Sachinbisht27 Jan 10, 2024
6e5a063
downgraded the watchdog version
Sachinbisht27 Jan 10, 2024
42c2f49
added upgraded versions for flask function framework and watchdog
Sachinbisht27 Jan 11, 2024
975dff6
Updated branch for staging build
Sachinbisht27 Jan 11, 2024
4aa40f3
removed greenlet from requirements
Sachinbisht27 Jan 11, 2024
d730a1e
upgraded requests package in requirements
Sachinbisht27 Jan 11, 2024
6f8e869
fixes for handling the request data as per content type
Sachinbisht27 Jan 11, 2024
d7bc869
Updated branch for staging build
Sachinbisht27 Jan 11, 2024
75c399c
downgraded request version
Sachinbisht27 Jan 11, 2024
66b044e
upgraded request version
Sachinbisht27 Jan 11, 2024
b0d30ef
Updated branch for staging build
Sachinbisht27 Jan 11, 2024
7e76974
Updated branch for staging build
Sachinbisht27 Jan 11, 2024
5b61e1e
Added language id in Registration table model
Sachinbisht27 Jan 11, 2024
aa105d8
Updated branch for staging build
Sachinbisht27 Jan 11, 2024
f3002cc
Updated branch for staging build
Sachinbisht27 Jan 11, 2024
5eb75c2
Merge pull request #69 from DostEducation/feature/66-fixes-for-the-up…
Sachinbisht27 Jan 12, 2024
9bedcf7
Merge branch 'develop' of https://github.com/DostEducation/RP_IVR_cal…
Sachinbisht27 Jan 12, 2024
03de53c
Fixed merge conflicts
Sachinbisht27 Jan 12, 2024
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
8 changes: 5 additions & 3 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/[email protected]
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: '3.9'
- uses: pre-commit/[email protected]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is the fix for the pre-commit failure issue.

2 changes: 1 addition & 1 deletion api/models/user.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from api.mixins import TimestampMixin
from api import db
from flask_sqlalchemy import BaseQuery
from flask_sqlalchemy.query import Query as BaseQuery
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The BaseQuery class has been renamed as query now and is situated within the query module.



class UserQuery(BaseQuery):
Expand Down
2 changes: 1 addition & 1 deletion api/models/user_program.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from api.mixins import TimestampMixin
from api import db
from api import app, models, helpers
from flask_sqlalchemy import BaseQuery
from flask_sqlalchemy.query import Query as BaseQuery
from api.helpers.common_helper import current_ist_time


Expand Down
1 change: 0 additions & 1 deletion config.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
% POSTGRES
)

SQLALCHEMY_TRACK_MODIFICATIONS = True
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed the SQLALCHEMY_TRACK_MODIFICATIONS because getting an error for the use of this after upgrading flask-SQLalchemy.

WTF_CSRF_ENABLED = True
SECRET_KEY = os.environ.get("SECRET_KEY")

Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Includes dev dependencies on top of requirements.txt
-r requirements.txt
functions-framework==2.1.2
functions-framework==3.5.0
pre-commit==2.11.0
20 changes: 11 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
certifi==2020.12.5
chardet==4.0.0
click==7.1.2
Flask==1.1.2
click==8.1.3
Flask==3.0.0
requests==2.25.1
python-dotenv==0.15.0
Flask-SQLAlchemy==2.1
Flask-SQLAlchemy==3.1.1
greenlet==3.0.3
idna==2.10
itsdangerous==1.1.0
Jinja2==2.11.3
MarkupSafe==1.1.1
psycopg2==2.8.6
itsdangerous==2.1.2
Jinja2==3.1.2
MarkupSafe==2.1.1
psycopg2==2.9.9
python-dotenv==0.15.0
requests==2.25.1
SQLAlchemy==1.3.23
SQLAlchemy==2.0.23
urllib3==1.26.3
Werkzeug==1.0.1
Werkzeug==3.0.0
watchdog==3.0.0
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These packages are interdependent with each other and upgraded to ensure compatibility with one another up to the latest supported versions.

google-cloud-logging==3.5.0
Loading