Skip to content

Commit 5d27c63

Browse files
committed
Update package and releases due to change with sqlalchemy 2.0.
1 parent d0b735e commit 5d27c63

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

app/ch11_migrations/starter/pypi_org/data/package.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import sqlalchemy as sa
55
import sqlalchemy.orm as orm
6+
from sqlalchemy.orm import Mapped
7+
68
from pypi_org.data.modelbase import SqlAlchemyBase
79
from pypi_org.data.releases import Release
810

@@ -25,7 +27,7 @@ class Package(SqlAlchemyBase):
2527
license: str = sa.Column(sa.String, index=True)
2628

2729
# releases relationship
28-
releases: List[Release] = orm.relation(
30+
releases: Mapped[Release] = orm.relationship(
2931
'Release',
3032
order_by=[
3133
Release.major_ver.desc(),

app/ch11_migrations/starter/pypi_org/data/releases.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Release(SqlAlchemyBase):
2020

2121
# Package relationship
2222
package_id: str = sqlalchemy.Column(sqlalchemy.String, sqlalchemy.ForeignKey('packages.id'))
23-
package = orm.relation('Package')
23+
package = orm.relationship('Package')
2424

2525
@property
2626
def version_text(self):

app/ch12-forms/starter/pypi_org/data/package.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
import sqlalchemy as sa
55
import sqlalchemy.orm as orm
6+
from sqlalchemy.orm import Mapped
7+
68
from pypi_org.data.modelbase import SqlAlchemyBase
79
from pypi_org.data.releases import Release
810

@@ -12,7 +14,6 @@ class Package(SqlAlchemyBase):
1214

1315
id: str = sa.Column(sa.String, primary_key=True)
1416
created_date: datetime.datetime = sa.Column(sa.DateTime, default=datetime.datetime.now, index=True)
15-
last_updated: datetime.datetime = sa.Column(sa.DateTime, default=datetime.datetime.now, index=True)
1617
summary: str = sa.Column(sa.String, nullable=False)
1718
description: str = sa.Column(sa.String, nullable=True)
1819

@@ -26,7 +27,7 @@ class Package(SqlAlchemyBase):
2627
license: str = sa.Column(sa.String, index=True)
2728

2829
# releases relationship
29-
releases: List[Release] = orm.relation(
30+
releases: Mapped[Release] = orm.relationship(
3031
'Release',
3132
order_by=[
3233
Release.major_ver.desc(),

app/ch12-forms/starter/pypi_org/data/releases.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Release(SqlAlchemyBase):
2020

2121
# Package relationship
2222
package_id: str = sqlalchemy.Column(sqlalchemy.String, sqlalchemy.ForeignKey('packages.id'))
23-
package = orm.relation('Package')
23+
package = orm.relationship('Package')
2424

2525
@property
2626
def version_text(self):

0 commit comments

Comments
 (0)