Skip to content

Commit 0b9ec2e

Browse files
authored
Merge branch 'main' into pujol-cg-10392-advanced-topics-in-importsexports
2 parents ab06237 + 801b1e7 commit 0b9ec2e

File tree

10 files changed

+9
-14
lines changed

10 files changed

+9
-14
lines changed

sqlalchemy_1.6_to_2.0/input_repo/main.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# main.py
22
from fastapi import FastAPI, Depends, HTTPException
33
from sqlalchemy.orm import Session
4-
import models, schemas
4+
import models
5+
import schemas
56
from database import SessionLocal, engine
67
from typing import List
78

sqlalchemy_1.6_to_2.0/input_repo/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
from sqlalchemy import Column, Integer, String, ForeignKey, Index
2-
from sqlalchemy.orm import relationship, backref
1+
from sqlalchemy import Column, Integer, String, ForeignKey
2+
from sqlalchemy.orm import relationship
33
from database import Base
44

55
class Publisher(Base):

sqlalchemy_1.6_to_2.0/output_repo/database.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# database.py
22
from sqlalchemy import create_engine
3-
from sqlalchemy.orm import DeclarativeBase
43
from sqlalchemy.orm import sessionmaker
54

65
SQLALCHEMY_DATABASE_URL = "postgresql://user:password@localhost/dbname" # Change to your database URL

sqlalchemy_1.6_to_2.0/output_repo/main.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# main.py
22
from fastapi import FastAPI, Depends, HTTPException
33
from sqlalchemy.orm import Session
4-
import models, schemas
4+
import models
5+
import schemas
56
from database import SessionLocal, engine
67
from typing import List
78

sqlalchemy_1.6_to_2.0/output_repo/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from typing import List, Optional
2-
from sqlalchemy import Column, Integer, String, ForeignKey
2+
from sqlalchemy import Integer, String, ForeignKey
33
from sqlalchemy.orm import relationship, Mapped, mapped_column
44
from database import Base
55

sqlalchemy_type_annotations/input_repo/models/organization.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
from sqlalchemy.orm import Mapped
21

3-
from datetime import datetime
42

53
from sqlalchemy import Column, Integer, String, DateTime
64
from sqlalchemy.orm import relationship

sqlalchemy_type_annotations/input_repo/models/transaction.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
from sqlalchemy.orm import Mapped
21

3-
from decimal import Decimal
42

5-
from datetime import datetime
63

74
from sqlalchemy import Column, Integer, String, ForeignKey, Numeric, DateTime
85
from sqlalchemy.orm import relationship

sqlalchemy_type_annotations/input_repo/models/user.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
from sqlalchemy.orm import Mapped
21

32
from sqlalchemy import Column, Integer, String, ForeignKey, Boolean
43
from sqlalchemy.orm import relationship

unittest_to_pytest/repo-after/tests/test_classes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import pytest
44
import unittest
5-
from unittest.mock import Mock, patch
5+
from unittest.mock import Mock
66
from jj_classes.castle import Castle
77
from jj_classes.character import Character
88

unittest_to_pytest/repo-before/tests/test_classes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# tests/test_classes.py
22

33
import unittest
4-
from unittest.mock import Mock, patch
4+
from unittest.mock import Mock
55
from jj_classes.castle import Castle
66
from jj_classes.character import Character
77

0 commit comments

Comments
 (0)