Skip to content

Commit 7bea120

Browse files
committed
Fix warnings in tests.
1 parent 272e1fc commit 7bea120

11 files changed

+11
-25
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def get_long_description():
2424
packages=find_packages(exclude=['tests']),
2525
install_requires=parse_requirements('base_requirements.txt'),
2626
extras_require={
27-
'sqlalchemy': ['sqlalchemy', 'sqlalchemy_utils']
27+
'sqlalchemy': ['sqlalchemy>=2.0', 'sqlalchemy_utils']
2828
},
2929
license='BSD',
3030
classifiers=[

tests/sqlalchemy_repository/filter_backend/test_sqlachemy_repository_many_to_many_direct_association_filters.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import sqlalchemy
55

66
from sqlalchemy import orm
7-
from sqlalchemy.ext.declarative import declarative_base
87

98
from flask_jsonapi.resource_repositories import sqlalchemy_repositories
109

11-
Base = declarative_base()
10+
Base = sqlalchemy.orm.declarative_base()
1211

1312

1413
class User(Base):

tests/sqlalchemy_repository/filter_backend/test_sqlachemy_repository_many_to_many_secondary_filters.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
import sqlalchemy
33

44
from sqlalchemy import orm
5-
from sqlalchemy.ext.declarative import declarative_base
65

76
from flask_jsonapi.resource_repositories import sqlalchemy_repositories
87

9-
Base = declarative_base()
8+
Base = sqlalchemy.orm.declarative_base()
109

1110

1211
class User(Base):

tests/sqlalchemy_repository/filter_backend/test_sqlachemy_repository_one_to_many_relationship_filters.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
import sqlalchemy
33

44
from sqlalchemy import orm
5-
from sqlalchemy.ext.declarative import declarative_base
65

76
from flask_jsonapi.resource_repositories import sqlalchemy_repositories
87

9-
Base = declarative_base()
8+
Base = sqlalchemy.orm.declarative_base()
109

1110

1211
class User(Base):

tests/sqlalchemy_repository/filter_backend/test_sqlachemy_repository_one_to_one_relationship_filters.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
import sqlalchemy
33

44
from sqlalchemy import orm
5-
from sqlalchemy.ext.declarative import declarative_base
65

76
from flask_jsonapi.resource_repositories import sqlalchemy_repositories
87

9-
Base = declarative_base()
8+
Base = sqlalchemy.orm.declarative_base()
109

1110

1211
class User(Base):

tests/sqlalchemy_repository/filter_backend/test_sqlalchemy_repository_filter_backend.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import pytest
22
import sqlalchemy
33

4-
from sqlalchemy.ext.declarative import declarative_base
5-
64
from flask_jsonapi.resource_repositories import sqlalchemy_repositories
75

8-
Base = declarative_base()
6+
Base = sqlalchemy.orm.declarative_base()
97

108

119
class User(Base):

tests/sqlalchemy_repository/test_sqlalchemy_repository_basic.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import pytest
22
import sqlalchemy
33

4-
from sqlalchemy.ext.declarative import declarative_base
5-
64
from flask_jsonapi.resource_repositories import sqlalchemy_repositories
75

8-
Base = declarative_base()
6+
Base = sqlalchemy.orm.declarative_base()
97

108

119
class User(Base):

tests/sqlalchemy_repository/test_sqlalchemy_repository_integration.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import pytest
22
import sqlalchemy
33

4-
from sqlalchemy.ext.declarative import declarative_base
5-
64
from flask_jsonapi.resource_repositories import sqlalchemy_repositories
75

8-
Base = declarative_base()
6+
Base = sqlalchemy.orm.declarative_base()
97

108

119
class User(Base):

tests/sqlalchemy_repository/test_sqlalchemy_repository_pagination.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import pytest
22
import sqlalchemy
33

4-
from sqlalchemy.ext.declarative import declarative_base
5-
64
from flask_jsonapi.resource_repositories import sqlalchemy_repositories
75

8-
Base = declarative_base()
6+
Base = sqlalchemy.orm.declarative_base()
97

108

119
class User(Base):

tests/sqlalchemy_repository/test_sqlalchemy_repository_sort.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import pytest
22
import sqlalchemy
33

4-
from sqlalchemy.ext.declarative import declarative_base
5-
64
from flask_jsonapi import exceptions
75
from flask_jsonapi.resource_repositories import sqlalchemy_repositories
86

9-
Base = declarative_base()
7+
Base = sqlalchemy.orm.declarative_base()
108

119

1210
class User(Base):

0 commit comments

Comments
 (0)