Skip to content

Commit

Permalink
[Improve] 兼容flask_sqlalchemy 3.1.1 (#82)
Browse files Browse the repository at this point in the history
  • Loading branch information
jscslld authored Oct 16, 2023
1 parent 4261790 commit fc764ee
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest]
python-version: ["3.7", "3.8"]
node-version: ["16", "17", "18"]
node-version: ["16", "17"]
include:
- python-version: "3.7"
os: windows-latest
Expand Down Expand Up @@ -52,12 +52,13 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
- name: Upgrade pip
run: python -m pip install pip --upgrade --user
run: python -m pip install pip==22.0.3 --upgrade --user
- name: Install PaddlePaddle
run: python -m pip install paddlepaddle==2.4.0 -i https://pypi.tuna.tsinghua.edu.cn/simple
- name: Install PaddleRS
run: |
python -m pip install -r PaddleRS/requirements.txt
python -m pip install "numpy<=1.23.5"
python -m pip install -e PaddleRS
- name: Install GDAL
run: python -m pip install ${{ matrix.gdal-whl-url }}
Expand Down
6 changes: 5 additions & 1 deletion backend/applications/extensions/init_sqlalchemy.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

from flask import Flask, request
from flask_marshmallow import Marshmallow
from flask_sqlalchemy import SQLAlchemy, BaseQuery
from flask_sqlalchemy import SQLAlchemy
try:
from flask_sqlalchemy import BaseQuery
except ImportError:
from flask_sqlalchemy.query import Query as BaseQuery
from marshmallow import fields
from marshmallow.validate import (URL, Email, Range, Length, Equal, Regexp,
Predicate, NoneOf, OneOf, ContainsOnly)
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"eslint-plugin-vue": "^9.5.1",
"file-saver": "^2.0.5",
"html2canvas": "^1.4.1",
"jszip": "^3.9.1",
"jszip": "^3.10.1",
"vue": "^3.2.13",
"vue-cropper": "^1.0.3",
"vue-keep-scroll-position": "^0.1.2",
Expand Down

0 comments on commit fc764ee

Please sign in to comment.