Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix 3.8 backport.timezone import #4908

Merged
merged 4 commits into from
May 2, 2024
Merged

Fix 3.8 backport.timezone import #4908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7014b1
Fix 3.8 import and remove dead comment in requirements.txt
stxue1 May 2, 2024
1ca4adf
Merge master into issues/4890-python-3.8-backport
github-actions[bot] May 2, 2024
746193f
Merge master into issues/4890-python-3.8-backport
github-actions[bot] May 2, 2024
cc296b8
Move Literal import.
DailyDreaming May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
dill>=0.3.2, <0.4
requests>=2, <3
docker>=6.1.0, <8
# Work around https://github.com/docker/docker-py/issues/3113
urllib3>=1.26.0,<3
python-dateutil
psutil >= 3.0.1, <6
Expand Down
5 changes: 2 additions & 3 deletions src/toil/test/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
Dict,
Generator,
List,
Literal,
Optional,
Tuple,
Type,
Expand All @@ -47,11 +48,9 @@
from urllib.request import urlopen


if sys.version_info >= (3, 8):
from typing import Literal
if sys.version_info >= (3, 9):
DailyDreaming marked this conversation as resolved.
Show resolved Hide resolved
import zoneinfo
else:
from typing_extensions import Literal
from backports import zoneinfo

from toil import ApplianceImageNotFound, applianceSelf, toilPackageDirPath
Expand Down
Loading