From 1d6f2e4123cfae0677204a8f8d0ac16c8734b356 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 3 Oct 2019 16:27:50 +0200 Subject: [PATCH 1/2] Temporary fix for CI --- packaging/build_wheel.sh | 2 ++ packaging/torchvision/meta.yaml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packaging/build_wheel.sh b/packaging/build_wheel.sh index b83a16a499f..7d37239563d 100755 --- a/packaging/build_wheel.sh +++ b/packaging/build_wheel.sh @@ -8,6 +8,8 @@ export BUILD_TYPE=wheel setup_env 0.5.0 setup_wheel_python pip_install numpy pyyaml future ninja +# TODO remove after https://github.com/pytorch/pytorch/pull/27282 gets merged +pip_install six setup_pip_pytorch_version python setup.py clean IS_WHEEL=1 python setup.py bdist_wheel diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index ab4c550f546..40d8523a53e 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -23,6 +23,7 @@ requirements: - numpy >=1.11 - six - av + - six # TODO remove me, only until https://github.com/pytorch/pytorch/pull/27282 gets merged {{ environ.get('CONDA_PYTORCH_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} @@ -50,6 +51,7 @@ test: - av - ca-certificates - typing + - six # TODO remove me, only until https://github.com/pytorch/pytorch/pull/27282 gets merged commands: pytest . From daec3cd3b922a52a835ce0a615fd56b713423d52 Mon Sep 17 00:00:00 2001 From: Francisco Massa Date: Thu, 3 Oct 2019 16:35:30 +0200 Subject: [PATCH 2/2] Missing install --- packaging/torchvision/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/torchvision/meta.yaml b/packaging/torchvision/meta.yaml index 40d8523a53e..fc47b0c3b29 100644 --- a/packaging/torchvision/meta.yaml +++ b/packaging/torchvision/meta.yaml @@ -13,6 +13,7 @@ requirements: - python - setuptools - av + - six # TODO remove me, only until https://github.com/pytorch/pytorch/pull/27282 gets merged {{ environ.get('CONDA_PYTORCH_BUILD_CONSTRAINT') }} {{ environ.get('CONDA_CUDATOOLKIT_CONSTRAINT') }} {{ environ.get('CONDA_CPUONLY_FEATURE') }}