Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
vision
Commits
ac83a2c0
Unverified
Commit
ac83a2c0
authored
Jul 01, 2021
by
Nicolas Hug
Committed by
GitHub
Jul 01, 2021
Browse files
Explicitly exclude PIL 8.3.0 from compatible dependencies (#4148)
parent
993325dd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
.circleci/unittest/linux/scripts/environment.yml
.circleci/unittest/linux/scripts/environment.yml
+1
-1
.circleci/unittest/windows/scripts/environment.yml
.circleci/unittest/windows/scripts/environment.yml
+1
-1
setup.py
setup.py
+2
-1
No files found.
.circleci/unittest/linux/scripts/environment.yml
View file @
ac83a2c0
...
@@ -12,6 +12,6 @@ dependencies:
...
@@ -12,6 +12,6 @@ dependencies:
-
ca-certificates
-
ca-certificates
-
pip
:
-
pip
:
-
future
-
future
-
pillow >=5.3.0
-
pillow >=5.3.0
, !=8.3.0
-
scipy
-
scipy
-
av
-
av
.circleci/unittest/windows/scripts/environment.yml
View file @
ac83a2c0
...
@@ -12,7 +12,7 @@ dependencies:
...
@@ -12,7 +12,7 @@ dependencies:
-
ca-certificates
-
ca-certificates
-
pip
:
-
pip
:
-
future
-
future
-
pillow >=5.3.0
-
pillow >=5.3.0
, !=8.3.0
-
scipy
-
scipy
-
av
-
av
-
dataclasses
-
dataclasses
setup.py
View file @
ac83a2c0
...
@@ -67,7 +67,8 @@ requirements = [
...
@@ -67,7 +67,8 @@ requirements = [
pytorch_dep
,
pytorch_dep
,
]
]
pillow_ver
=
' >= 5.3.0'
# Excluding 8.3.0 because of https://github.com/pytorch/vision/issues/4146
pillow_ver
=
' >= 5.3.0, !=8.3.0'
pillow_req
=
'pillow-simd'
if
get_dist
(
'pillow-simd'
)
is
not
None
else
'pillow'
pillow_req
=
'pillow-simd'
if
get_dist
(
'pillow-simd'
)
is
not
None
else
'pillow'
requirements
.
append
(
pillow_req
+
pillow_ver
)
requirements
.
append
(
pillow_req
+
pillow_ver
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment