Skip to content

Commit

Permalink
Merge branch 'master' into upgrade-test-packages
Browse files Browse the repository at this point in the history
  • Loading branch information
wongcht authored Sep 4, 2023
2 parents b5ba046 + baaef0d commit e2861f1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .isort.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[settings]
known_third_party = aniso8601,graphql,graphql_relay,promise,pytest,pytz,pyutils,setuptools,snapshottest,sphinx_graphene_theme
known_third_party = aniso8601,graphql,graphql_relay,promise,pytest,pyutils,setuptools,snapshottest,sphinx_graphene_theme
3 changes: 1 addition & 2 deletions graphene/types/tests/test_datetime.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import datetime

import pytz
from graphql import GraphQLError

from pytest import fixture
Expand Down Expand Up @@ -30,7 +29,7 @@ def resolve_time(self, info, _at=None):

@fixture
def sample_datetime():
utc_datetime = datetime.datetime(2019, 5, 25, 5, 30, 15, 10, pytz.utc)
utc_datetime = datetime.datetime(2019, 5, 25, 5, 30, 15, 10, datetime.timezone.utc)
return utc_datetime


Expand Down
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ def run_tests(self):
"snapshottest>=0.6,<1",
"coveralls>=3.3,<4",
"mock>=5,<6",
"pytz==2022.1",
"iso8601>=2,<3",
]

Expand Down

0 comments on commit e2861f1

Please sign in to comment.