"...models/git@developer.sourcefind.cn:OpenDAS/lmdeploy.git" did not exist on "3295eac36c4dbcab57ee3e40ed02e00c278eb8b7"
Unverified Commit 5e264580 authored by Vasilis Vryniotis's avatar Vasilis Vryniotis Committed by GitHub
Browse files

Removing/replacing Py3.6 references. (#5161)

parent 8c546f60
......@@ -25,12 +25,12 @@ RUN apt-get -qq update && apt-get -qq -y install curl bzip2 libsox-fmt-all \
ENV PATH /opt/conda/bin:$PATH
RUN conda create -y --name python3.6 python=3.6
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.9 python=3.9
SHELL [ "/bin/bash", "-c" ]
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,!=8.3.*"
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,!=8.3.*"
RUN source /usr/local/etc/profile.d/conda.sh && conda activate python3.9 && conda install -y "Pillow>=5.3.0,!=8.3.*"
CMD [ "/bin/bash"]
......@@ -36,11 +36,5 @@ else
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" "pytorch-${UPLOAD_CHANNEL}"::pytorch[build="*${version}*"] "${cudatoolkit}" pytest
fi
if [ $PYTHON_VERSION == "3.6" ]; then
printf "Installing minimal PILLOW version\n"
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
pip install "pillow>=5.3.0,!=8.3.*"
fi
printf "* Installing torchvision\n"
python setup.py develop
......@@ -30,12 +30,6 @@ fi
printf "Installing PyTorch with %s\n" "${cudatoolkit}"
conda install -y -c "pytorch-${UPLOAD_CHANNEL}" -c conda-forge "pytorch-${UPLOAD_CHANNEL}"::pytorch[build="*${version}*"] "${cudatoolkit}" pytest
if [ $PYTHON_VERSION == "3.6" ]; then
printf "Installing minimal PILLOW version\n"
# Install the minimal PILLOW version. Otherwise, let setup.py install the latest
pip install "pillow>=5.3.0,!=8.3.*"
fi
torch_cuda=$(python -c "import torch; print(torch.cuda.is_available())")
echo torch.cuda.is_available is $torch_cuda
......
......@@ -18,7 +18,7 @@ jobs:
- name: Set up python
uses: actions/setup-python@v2
with:
python-version: 3.6
python-version: 3.7
- name: Upgrade system packages
run: python -m pip install --upgrade pip setuptools wheel
......
......@@ -14,7 +14,7 @@ repos:
# rev: v2.29.0
# hooks:
# - id: pyupgrade
# args: [--py36-plus]
# args: [--py37-plus]
# name: Upgrade code
- repo: https://github.com/omnilib/ufmt
......
......@@ -183,7 +183,7 @@ retry () {
}
# Inputs:
# PYTHON_VERSION (2.7, 3.5, 3.6, 3.7)
# PYTHON_VERSION (3.7, 3.8, 3.9)
# UNICODE_ABI (bool)
#
# Outputs:
......@@ -202,15 +202,6 @@ setup_wheel_python() {
# Install native CentOS libJPEG, freetype and GnuTLS
yum install -y libjpeg-turbo-devel freetype gnutls
case "$PYTHON_VERSION" in
2.7)
if [[ -n "$UNICODE_ABI" ]]; then
python_abi=cp27-cp27mu
else
python_abi=cp27-cp27m
fi
;;
3.5) python_abi=cp35-cp35m ;;
3.6) python_abi=cp36-cp36m ;;
3.7) python_abi=cp37-cp37m ;;
3.8) python_abi=cp38-cp38 ;;
3.9) python_abi=cp39-cp39 ;;
......
......@@ -7,8 +7,7 @@ c_compiler:
cxx_compiler:
- vs2017 # [win]
python:
- 3.5
- 3.6
- 3.7
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
# For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
......
......@@ -5,8 +5,7 @@ c_compiler:
cxx_compiler:
- vs2017 # [win]
python:
- 3.5
- 3.6
- 3.7
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
# For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
......
......@@ -5,8 +5,7 @@ c_compiler:
cxx_compiler:
- vs2019 # [win]
python:
- 3.5
- 3.6
- 3.7
# This differs from target_platform in that it determines what subdir the compiler
# will target, not what subdir the compiler package will be itself.
# For example, we need a win-64 vs2008_win-32 package, so that we compile win-32
......
......@@ -21,7 +21,7 @@ rm -rf vision
git clone https://github.com/pytorch/vision
pushd vision
desired_pythons=( "2.7" "3.5" "3.6" "3.7" )
desired_pythons=( "3.7" "3.8" "3.9" )
# for each python
for desired_python in "${desired_pythons[@]}"
do
......
......@@ -5,7 +5,7 @@ first_party_detection = false
[tool.black]
line-length = 120
target-version = ["py36"]
target-version = ["py37"]
[tool.ufmt]
......
......@@ -525,7 +525,7 @@ if __name__ == "__main__":
"scipy": ["scipy"],
},
ext_modules=get_extensions(),
python_requires=">=3.6",
python_requires=">=3.7",
cmdclass={
"build_ext": BuildExtension.with_options(no_python_abi_suffix=True),
"clean": clean,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment