Update package and releases due to change with sqlalchemy 2.0.

Author: mikeckennedy

app/ch13-validation/final/pypi_org/bin/load_data.py

@@ -9,7 +9,7 @@
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
-from pypi_org.bin.load_data import try_int
+from pypi_org.infrastructure.num_convert 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/ch13-validation/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/ch13-validation/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/ch13-validation/starter/pypi_org/bin/load_data.py

@@ -9,6 +9,7 @@
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
+from pypi_org.infrastructure.num_convert 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
@@ -333,13 +334,6 @@ def make_version_num(version_text):
         return major, minor, build
 
 
-def try_int(text) -> Optional[int]:
-    try:
-        return int(text)
-    except:
-        return None
-
-
 def init_db():
     top_folder = os.path.dirname(__file__)
     rel_file = os.path.join('..', 'db', 'pypi.sqlite')

app/ch13-validation/starter/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/ch13-validation/starter/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/ch14_testing/final/pypi_org/bin/load_data.py

@@ -9,6 +9,7 @@
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
+from pypi_org.infrastructure.num_convert 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
@@ -333,13 +334,6 @@ def make_version_num(version_text):
         return major, minor, build
 
 
-def try_int(text) -> Optional[int]:
-    try:
-        return int(text)
-    except:
-        return None
-
-
 def init_db():
     top_folder = os.path.dirname(__file__)
     rel_file = os.path.join('..', 'db', 'pypi.sqlite')

app/ch14_testing/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/ch14_testing/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/ch14_testing/starter/pypi_org/bin/load_data.py

@@ -9,6 +9,7 @@
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')))
 
+from pypi_org.infrastructure.num_convert 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
@@ -333,13 +334,6 @@ def make_version_num(version_text):
         return major, minor, build
 
 
-def try_int(text) -> Optional[int]:
-    try:
-        return int(text)
-    except:
-        return None
-
-
 def init_db():
     top_folder = os.path.dirname(__file__)
     rel_file = os.path.join('..', 'db', 'pypi.sqlite')