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
fa1aa52d
Unverified
Commit
fa1aa52d
authored
Nov 18, 2021
by
F-G Fernandez
Committed by
GitHub
Nov 18, 2021
Browse files
chore: Updated all pillow version specifiers (#4946)
Co-authored-by:
Philip Meier
<
github.pmeier@posteo.de
>
parent
845391cd
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
11 deletions
+11
-11
.circleci/config.yml
.circleci/config.yml
+1
-1
.circleci/config.yml.in
.circleci/config.yml.in
+1
-1
.circleci/smoke_test/docker/Dockerfile
.circleci/smoke_test/docker/Dockerfile
+3
-3
.circleci/unittest/linux/scripts/environment.yml
.circleci/unittest/linux/scripts/environment.yml
+1
-1
.circleci/unittest/linux/scripts/install.sh
.circleci/unittest/linux/scripts/install.sh
+1
-1
.circleci/unittest/windows/scripts/environment.yml
.circleci/unittest/windows/scripts/environment.yml
+1
-1
.circleci/unittest/windows/scripts/install.sh
.circleci/unittest/windows/scripts/install.sh
+1
-1
packaging/build_cmake.sh
packaging/build_cmake.sh
+1
-1
packaging/torchvision/meta.yaml
packaging/torchvision/meta.yaml
+1
-1
No files found.
.circleci/config.yml
View file @
fa1aa52d
...
@@ -604,7 +604,7 @@ jobs:
...
@@ -604,7 +604,7 @@ jobs:
conda env remove -n python${PYTHON_VERSION} || true
conda env remove -n python${PYTHON_VERSION} || true
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda install Pillow>=5.3.0
conda install
"
Pillow>=5.3.0
,!=8.3.*"
conda install -v -y -c pytorch-nightly pytorch
conda install -v -y -c pytorch-nightly pytorch
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
-
run
:
-
run
:
...
...
.circleci/config.yml.in
View file @
fa1aa52d
...
@@ -604,7 +604,7 @@ jobs:
...
@@ -604,7 +604,7 @@ jobs:
conda env remove -n python${PYTHON_VERSION} || true
conda env remove -n python${PYTHON_VERSION} || true
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda create -yn python${PYTHON_VERSION} python=${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda activate python${PYTHON_VERSION}
conda install Pillow>=5.3.0
conda install
"
Pillow>=5.3.0
,!=8.3.*"
conda install -v -y -c pytorch-nightly pytorch
conda install -v -y -c pytorch-nightly pytorch
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
conda install -v -y $(ls ~/workspace/torchvision*.tar.bz2)
- run:
- run:
...
...
.circleci/smoke_test/docker/Dockerfile
View file @
fa1aa52d
...
@@ -30,7 +30,7 @@ RUN conda create -y --name python3.7 python=3.7
...
@@ -30,7 +30,7 @@ RUN conda create -y --name python3.7 python=3.7
RUN
conda create
-y
--name
python3.8
python
=
3.8
RUN
conda create
-y
--name
python3.8
python
=
3.8
SHELL
[ "/bin/bash", "-c" ]
SHELL
[ "/bin/bash", "-c" ]
RUN
echo
"source /usr/local/etc/profile.d/conda.sh"
>>
~/.bashrc
RUN
echo
"source /usr/local/etc/profile.d/conda.sh"
>>
~/.bashrc
RUN
source
/usr/local/etc/profile.d/conda.sh
&&
conda activate python3.6
&&
conda
install
-y
Pillow>
=
5.3.0
RUN
source
/usr/local/etc/profile.d/conda.sh
&&
conda activate python3.6
&&
conda
install
-y
"
Pillow>=5.3.0
,!=8.3.*"
RUN
source
/usr/local/etc/profile.d/conda.sh
&&
conda activate python3.7
&&
conda
install
-y
Pillow>
=
5.3.0
RUN
source
/usr/local/etc/profile.d/conda.sh
&&
conda activate python3.7
&&
conda
install
-y
"
Pillow>=5.3.0
,!=8.3.*"
RUN
source
/usr/local/etc/profile.d/conda.sh
&&
conda activate python3.8
&&
conda
install
-y
Pillow>
=
5.3.0
RUN
source
/usr/local/etc/profile.d/conda.sh
&&
conda activate python3.8
&&
conda
install
-y
"
Pillow>=5.3.0
,!=8.3.*"
CMD
[ "/bin/bash"]
CMD
[ "/bin/bash"]
.circleci/unittest/linux/scripts/environment.yml
View file @
fa1aa52d
...
@@ -11,6 +11,6 @@ dependencies:
...
@@ -11,6 +11,6 @@ dependencies:
-
ca-certificates
-
ca-certificates
-
pip
:
-
pip
:
-
future
-
future
-
pillow >=5.3.0, !=8.3.
0
-
pillow >=5.3.0, !=8.3.
*
-
scipy
-
scipy
-
av
-
av
.circleci/unittest/linux/scripts/install.sh
View file @
fa1aa52d
...
@@ -39,7 +39,7 @@ fi
...
@@ -39,7 +39,7 @@ fi
if
[
$PYTHON_VERSION
==
"3.6"
]
;
then
if
[
$PYTHON_VERSION
==
"3.6"
]
;
then
printf
"Installing minimal PILLOW version
\n
"
printf
"Installing minimal PILLOW version
\n
"
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
pip
install
pillow>
=
5.3.0
pip
install
"
pillow>=5.3.0
,!=8.3.*"
fi
fi
printf
"* Installing torchvision
\n
"
printf
"* Installing torchvision
\n
"
...
...
.circleci/unittest/windows/scripts/environment.yml
View file @
fa1aa52d
...
@@ -11,7 +11,7 @@ dependencies:
...
@@ -11,7 +11,7 @@ dependencies:
-
ca-certificates
-
ca-certificates
-
pip
:
-
pip
:
-
future
-
future
-
pillow >=5.3.0, !=8.3.
0
-
pillow >=5.3.0, !=8.3.
*
-
scipy
-
scipy
-
av
-
av
-
dataclasses
-
dataclasses
.circleci/unittest/windows/scripts/install.sh
View file @
fa1aa52d
...
@@ -33,7 +33,7 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD
...
@@ -33,7 +33,7 @@ conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD
if
[
$PYTHON_VERSION
==
"3.6"
]
;
then
if
[
$PYTHON_VERSION
==
"3.6"
]
;
then
printf
"Installing minimal PILLOW version
\n
"
printf
"Installing minimal PILLOW version
\n
"
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
pip
install
pillow>
=
5.3.0
pip
install
"
pillow>=5.3.0
,!=8.3.*"
fi
fi
torch_cuda
=
$(
python
-c
"import torch; print(torch.cuda.is_available())"
)
torch_cuda
=
$(
python
-c
"import torch; print(torch.cuda.is_available())"
)
...
...
packaging/build_cmake.sh
View file @
fa1aa52d
...
@@ -21,7 +21,7 @@ setup_conda_pytorch_constraint
...
@@ -21,7 +21,7 @@ setup_conda_pytorch_constraint
setup_conda_cudatoolkit_plain_constraint
setup_conda_cudatoolkit_plain_constraint
if
[[
"
$OSTYPE
"
==
"msys"
]]
;
then
if
[[
"
$OSTYPE
"
==
"msys"
]]
;
then
conda
install
-yq
conda-build cmake pillow>
=
5.3.0 future
conda
install
-yq
conda-build cmake
"
pillow>=5.3.0
,!=8.3.*"
future
pip
install
dataclasses
pip
install
dataclasses
fi
fi
...
...
packaging/torchvision/meta.yaml
View file @
fa1aa52d
...
@@ -27,7 +27,7 @@ requirements:
...
@@ -27,7 +27,7 @@ requirements:
-
libpng
-
libpng
-
ffmpeg >=4.2
# [not win]
-
ffmpeg >=4.2
# [not win]
-
jpeg
-
jpeg
-
pillow >=5.3.0
-
pillow >=5.3.0
, !=8.3.*
-
pytorch-mutex 1.0 {{ build_variant }}
# [not osx ]
-
pytorch-mutex 1.0 {{ build_variant }}
# [not osx ]
{{
environ.get('CONDA_PYTORCH_CONSTRAINT')
}}
{{
environ.get('CONDA_PYTORCH_CONSTRAINT')
}}
{{
environ.get('CONDA_CUDATOOLKIT_CONSTRAINT'
,
'
'
)
}}
{{
environ.get('CONDA_CUDATOOLKIT_CONSTRAINT'
,
'
'
)
}}
...
...
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