Update package and releases due to change with sqlalchemy 2.0.

Author: mikeckennedy

app/ch09_sqlalchemy/final/pypi_org/data/package.py

@@ -3,6 +3,8 @@
 
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
+from sqlalchemy.orm import Mapped
+
 from pypi_org.data.modelbase import SqlAlchemyBase
 from pypi_org.data.releases import Release
 
@@ -25,7 +27,7 @@ class Package(SqlAlchemyBase):
     license = sa.Column(sa.String, index=True)
 
     # releases relationship
-    releases: List[Release] = orm.relation(
+    releases: Mapped[Release] = orm.relationship(
         'Release',
         order_by=[
             Release.major_ver.desc(),

app/ch09_sqlalchemy/final/pypi_org/data/releases.py

@@ -20,7 +20,7 @@ class Release(SqlAlchemyBase):
 
     # Package relationship
     package_id = sqlalchemy.Column(sqlalchemy.String, sqlalchemy.ForeignKey('packages.id'))
-    package = orm.relation('Package')
+    package = orm.relationship('Package')
 
     @property
     def version_text(self):

app/ch10_using_sqlachemy/final/pypi_org/data/package.py

@@ -3,6 +3,8 @@
 
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
+from sqlalchemy.orm import Mapped
+
 from pypi_org.data.modelbase import SqlAlchemyBase
 from pypi_org.data.releases import Release
 
@@ -25,7 +27,7 @@ class Package(SqlAlchemyBase):
     license: str = sa.Column(sa.String, index=True)
 
     # releases relationship
-    releases: List[Release] = orm.relation(
+    releases: Mapped[Release] = orm.relationship(
         'Release',
         order_by=[
             Release.major_ver.desc(),

app/ch10_using_sqlachemy/final/pypi_org/data/releases.py

@@ -20,7 +20,7 @@ class Release(SqlAlchemyBase):
 
     # Package relationship
     package_id: str = sqlalchemy.Column(sqlalchemy.String, sqlalchemy.ForeignKey('packages.id'))
-    package = orm.relation('Package')
+    package = orm.relationship('Package')
 
     @property
     def version_text(self):

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

@@ -3,29 +3,31 @@
 
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
+from sqlalchemy.orm import Mapped
+
 from pypi_org.data.modelbase import SqlAlchemyBase
 from pypi_org.data.releases import Release
 
 
 class Package(SqlAlchemyBase):
     __tablename__ = 'packages'
 
-    id = sa.Column(sa.String, primary_key=True)
-    created_date = sa.Column(sa.DateTime, default=datetime.datetime.now, index=True)
-    summary = sa.Column(sa.String, nullable=False)
-    description = sa.Column(sa.String, nullable=True)
+    id: str = sa.Column(sa.String, primary_key=True)
+    created_date: datetime.datetime = sa.Column(sa.DateTime, default=datetime.datetime.now, index=True)
+    summary: str = sa.Column(sa.String, nullable=False)
+    description: str = sa.Column(sa.String, nullable=True)
 
-    home_page = sa.Column(sa.String)
-    docs_url = sa.Column(sa.String)
-    package_url = sa.Column(sa.String)
+    home_page: str = sa.Column(sa.String)
+    docs_url: str = sa.Column(sa.String)
+    package_url: str = sa.Column(sa.String)
 
-    author_name = sa.Column(sa.String)
-    author_email = sa.Column(sa.String, index=True)
+    author_name: str = sa.Column(sa.String)
+    author_email: str = sa.Column(sa.String, index=True)
 
-    license = sa.Column(sa.String, index=True)
+    license: str = sa.Column(sa.String, index=True)
 
     # releases relationship
-    releases: List[Release] = orm.relation(
+    releases: Mapped[Release] = orm.relationship(
         'Release',
         order_by=[
             Release.major_ver.desc(),

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

@@ -7,20 +7,20 @@
 class Release(SqlAlchemyBase):
     __tablename__ = 'releases'
 
-    id = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True, autoincrement=True)
+    id: int = sqlalchemy.Column(sqlalchemy.Integer, primary_key=True, autoincrement=True)
 
-    major_ver = sqlalchemy.Column(sqlalchemy.BigInteger, index=True)
-    minor_ver = sqlalchemy.Column(sqlalchemy.BigInteger, index=True)
-    build_ver = sqlalchemy.Column(sqlalchemy.BigInteger, index=True)
+    major_ver: int = sqlalchemy.Column(sqlalchemy.BigInteger, index=True)
+    minor_ver: int = sqlalchemy.Column(sqlalchemy.BigInteger, index=True)
+    build_ver: int = sqlalchemy.Column(sqlalchemy.BigInteger, index=True)
 
-    created_date = sqlalchemy.Column(sqlalchemy.DateTime, default=datetime.datetime.now, index=True)
-    comment = sqlalchemy.Column(sqlalchemy.String)
-    url = sqlalchemy.Column(sqlalchemy.String)
-    size = sqlalchemy.Column(sqlalchemy.BigInteger)
+    created_date: datetime.datetime = sqlalchemy.Column(sqlalchemy.DateTime, default=datetime.datetime.now, index=True)
+    comment: str = sqlalchemy.Column(sqlalchemy.String)
+    url: str = sqlalchemy.Column(sqlalchemy.String)
+    size: int = sqlalchemy.Column(sqlalchemy.BigInteger)
 
     # Package relationship
-    package_id = sqlalchemy.Column(sqlalchemy.String, sqlalchemy.ForeignKey('packages.id'))
-    package = orm.relation('Package')
+    package_id: str = sqlalchemy.Column(sqlalchemy.String, sqlalchemy.ForeignKey('packages.id'))
+    package = orm.relationship('Package')
 
     @property
     def version_text(self):

app/ch11_migrations/final/pypi_org/bin/load_data.py

@@ -7,9 +7,10 @@
 import progressbar
 from dateutil.parser import parse
 
+from pypi_org.infrastructure.num_convert import try_int
+
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
-from pypi_org.bin.load_data import try_int
 import pypi_org.data.db_session as db_session
 from pypi_org.data.languages import ProgrammingLanguage
 from pypi_org.data.licenses import License

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

@@ -3,6 +3,8 @@
 
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
+from sqlalchemy.orm import Mapped
+
 from pypi_org.data.modelbase import SqlAlchemyBase
 from pypi_org.data.releases import Release
 
@@ -12,7 +14,6 @@ class Package(SqlAlchemyBase):
 
     id: str = sa.Column(sa.String, primary_key=True)
     created_date: datetime.datetime = sa.Column(sa.DateTime, default=datetime.datetime.now, index=True)
-    last_updated: datetime.datetime = sa.Column(sa.DateTime, default=datetime.datetime.now, index=True)
     summary: str = sa.Column(sa.String, nullable=False)
     description: str = sa.Column(sa.String, nullable=True)
 
@@ -26,7 +27,7 @@ class Package(SqlAlchemyBase):
     license: str = sa.Column(sa.String, index=True)
 
     # releases relationship
-    releases: List[Release] = orm.relation(
+    releases: Mapped[Release] = orm.relationship(
         'Release',
         order_by=[
             Release.major_ver.desc(),

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

@@ -20,7 +20,7 @@ class Release(SqlAlchemyBase):
 
     # Package relationship
     package_id: str = sqlalchemy.Column(sqlalchemy.String, sqlalchemy.ForeignKey('packages.id'))
-    package = orm.relation('Package')
+    package = orm.relationship('Package')
 
     @property
     def version_text(self):

app/ch11_migrations/final/pypi_org/infrastructure/num_convert.py

@@ -0,0 +1,8 @@
+from typing import Optional
+
+
+def try_int(text) -> Optional[int]:
+    try:
+        return int(text)
+    except:
+        return None