Merge pull request #99 from eReuse/dependabot/pip/sqlalchemy-1.3.0

Bump sqlalchemy from 1.2.17 to 1.3.24
This commit is contained in:
Santiago L 2022-02-22 13:19:35 +01:00 committed by GitHub
commit 919e4f4e48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions

View file

@ -1748,7 +1748,7 @@ class MoveOnDocument(JoinedTableMixin, ActionWithMultipleTradeDocuments):
"""Action than certify one movement of some indescriptible material of
one container to an other."""
weight = db.Column(db.Float(nullable=True))
weight = db.Column(db.Float())
weight.comment = """Weight than go to recycling"""
container_from_id = db.Column(
db.BigInteger,

View file

@ -72,7 +72,7 @@ class TradeDocument(Thing):
file_hash.comment = """This is the hash of the file produced from frontend."""
url = db.Column(URL())
url.comment = """This is the url where resides the document."""
weight = db.Column(db.Float(nullable=True))
weight = db.Column(db.Float())
weight.comment = """This is the weight of one container than this document express."""
__table_args__ = (
@ -150,10 +150,10 @@ class TradeDocument(Thing):
with suppress(StopIteration, ValueError):
actions = copy.copy(self.actions)
actions.sort(key=lambda x: x.created)
t_trades = ['Trade',
'Confirm',
'ConfirmRevokeDocument',
'RevokeDocument',
t_trades = ['Trade',
'Confirm',
'ConfirmRevokeDocument',
'RevokeDocument',
'ConfirmDocument']
return next(e for e in reversed(actions) if e.t in t_trades)

View file

@ -12,6 +12,7 @@ Flask-Cors==3.0.10
Flask-SQLAlchemy==2.3.2
hashids==1.2.0
inflection==0.3.1
itsdangerous==2.0.1
marshmallow==3.0.0b11
marshmallow-enum==1.4.1
passlib==1.7.1
@ -23,7 +24,7 @@ python-stdnum==1.9
PyYAML==5.4
requests[security]==2.27.1
requests-mock==1.5.2
SQLAlchemy==1.2.17
SQLAlchemy==1.3.24
SQLAlchemy-Utils==0.33.11
teal==0.2.0a38
webargs==5.5.3