From 6348ac2d0755b9c207f22ceee28c5c8f8c8f3804 Mon Sep 17 00:00:00 2001 From: Nayef Ahmed Date: Thu, 26 May 2022 15:42:05 -0400 Subject: [PATCH 1/6] Added post install script for pywin32 --- .circleci/unittest/windows/scripts/setup_env.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index 130f14a094..abde7f039a 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -45,3 +45,7 @@ printf "* Downloading SpaCy English models\n" python -m spacy download en_core_web_sm printf "* Downloading SpaCy German models\n" python -m spacy download de_core_news_sm + +# 6. Post install script for pywin32 +curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.p +python3 pywin32_postinstall.py -install From ba2a5560afb8aad6d74ea2ff016a5bc50d0fc4b4 Mon Sep 17 00:00:00 2001 From: Nayef Ahmed Date: Thu, 26 May 2022 15:52:16 -0400 Subject: [PATCH 2/6] Update command to python --- .circleci/unittest/windows/scripts/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index abde7f039a..66c3b63048 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -48,4 +48,4 @@ python -m spacy download de_core_news_sm # 6. Post install script for pywin32 curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.p -python3 pywin32_postinstall.py -install +python pywin32_postinstall.py -install From 7d28d72830b5be0ffd363cca5c34b968ccfa101e Mon Sep 17 00:00:00 2001 From: Nayef Ahmed Date: Tue, 31 May 2022 17:55:27 -0400 Subject: [PATCH 3/6] fix incorrect file extension --- .circleci/unittest/windows/scripts/setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index 66c3b63048..4b63c38f24 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -47,5 +47,5 @@ printf "* Downloading SpaCy German models\n" python -m spacy download de_core_news_sm # 6. Post install script for pywin32 -curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.p +curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.py python pywin32_postinstall.py -install From bee809a804da10b6595fe87019aa36a0339eae30 Mon Sep 17 00:00:00 2001 From: Nayef Ahmed Date: Tue, 31 May 2022 18:22:06 -0400 Subject: [PATCH 4/6] trying pinned version of pywin --- .circleci/unittest/windows/scripts/setup_env.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index 4b63c38f24..e926be8269 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -47,5 +47,6 @@ printf "* Downloading SpaCy German models\n" python -m spacy download de_core_news_sm # 6. Post install script for pywin32 -curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.py -python pywin32_postinstall.py -install +pip install --upgrade pywin32==225 +# curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.py +# python pywin32_postinstall.py -install From 404efec6bea7ba251d58e3cafd42466b86ff62ca Mon Sep 17 00:00:00 2001 From: Nayef Ahmed Date: Tue, 31 May 2022 21:08:34 -0400 Subject: [PATCH 5/6] Readding post script install --- .circleci/unittest/windows/scripts/setup_env.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index e926be8269..4b63c38f24 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -47,6 +47,5 @@ printf "* Downloading SpaCy German models\n" python -m spacy download de_core_news_sm # 6. Post install script for pywin32 -pip install --upgrade pywin32==225 -# curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.py -# python pywin32_postinstall.py -install +curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.py +python pywin32_postinstall.py -install From 68320c9856a39c86d63e7e1bf60230e33853884b Mon Sep 17 00:00:00 2001 From: Nayef Ahmed Date: Wed, 1 Jun 2022 13:08:33 -0400 Subject: [PATCH 6/6] Moved post install to install.sh --- .circleci/unittest/windows/scripts/install.sh | 6 +++++- .circleci/unittest/windows/scripts/setup_env.sh | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/unittest/windows/scripts/install.sh b/.circleci/unittest/windows/scripts/install.sh index 4a296393e5..bd7609f734 100644 --- a/.circleci/unittest/windows/scripts/install.sh +++ b/.circleci/unittest/windows/scripts/install.sh @@ -18,9 +18,13 @@ conda activate ./env printf "* Installing PyTorch\n" conda install -y -c "pytorch-${UPLOAD_CHANNEL}" ${CONDA_CHANNEL_FLAGS} pytorch cpuonly -printf "Installing torchdata nightly\n" +printf "* Installing torchdata nightly\n" pip install --pre torchdata --extra-index-url https://download.pytorch.org/whl/nightly/cpu +printf "* Installing pywin32_postinstall script\n" +curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.py +python pywin32_postinstall.py -install + printf "* Installing torchtext\n" git submodule update --init --recursive "$root_dir/packaging/vc_env_helper.bat" python setup.py develop diff --git a/.circleci/unittest/windows/scripts/setup_env.sh b/.circleci/unittest/windows/scripts/setup_env.sh index 4b63c38f24..130f14a094 100644 --- a/.circleci/unittest/windows/scripts/setup_env.sh +++ b/.circleci/unittest/windows/scripts/setup_env.sh @@ -45,7 +45,3 @@ printf "* Downloading SpaCy English models\n" python -m spacy download en_core_web_sm printf "* Downloading SpaCy German models\n" python -m spacy download de_core_news_sm - -# 6. Post install script for pywin32 -curl --output pywin32_postinstall.py https://raw.githubusercontent.com/mhammond/pywin32/main/pywin32_postinstall.py -python pywin32_postinstall.py -install