From 748d802f044237c0cfccb324f8477d2865ec6c82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= <moebius@cs.rwth-aachen.de> Date: Mon, 7 Mar 2022 11:02:44 +0100 Subject: [PATCH] MOved VS2017 build from python 3.7 to 3.9 --- .gitlab-ci.yml | 22 +++++++++---------- CI/build-3.7-VS2017.bat | 4 ---- CI/build-3.9-VS2017.bat | 4 ++++ ...y-3.7-VS2017.bat => deploy-3.9-VS2017.bat} | 0 ...est-3.7-VS2017.bat => test-3.9-VS2017.bat} | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 CI/build-3.7-VS2017.bat create mode 100644 CI/build-3.9-VS2017.bat rename CI/{deploy-3.7-VS2017.bat => deploy-3.9-VS2017.bat} (100%) rename CI/{test-3.7-VS2017.bat => test-3.9-VS2017.bat} (57%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 02ea7ea..2eb9646 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,19 +3,19 @@ stages: - test - deploy -build-3.7-VS2017: +build-3.9-VS2017: stage: build tags: - VS2017 - - python37 + - python39 variables: BUILD_PLATFORM: "VS2017" ARCHITECTURE: "x64" before_script: - git submodule sync --recursive - git submodule update --init --recursive - script: "CI\\build-3.7-VS2017.bat" + script: "CI\\build-3.9-VS2017.bat" artifacts: paths: - dist3/ @@ -83,15 +83,15 @@ build-2.7-macos: paths: - dist2/ -test-3.7-VS2017: +test-3.9-VS2017: stage: test tags: - VS2017 - - python37 + - python39 dependencies: - - build-3.7-VS2017 - script: "CI\\test-3.7-VS2017.bat" + - build-3.9-VS2017 + script: "CI\\test-3.9-VS2017.bat" test-3.9-linux: @@ -153,15 +153,15 @@ test-2.7-macos: - cd tests - python -m unittest discover -deploy-3.7-VS2017: +deploy-3.9-VS2017: stage: deploy tags: - VS2017 - - python37 + - python39 dependencies: - - build-3.7-VS2017 - script: "CI\\deploy-3.7-VS2017.bat" + - build-3.9-VS2017 + script: "CI\\deploy-3.9-VS2017.bat" artifacts: paths: - release/*.whl diff --git a/CI/build-3.7-VS2017.bat b/CI/build-3.7-VS2017.bat deleted file mode 100644 index f23dd8d..0000000 --- a/CI/build-3.7-VS2017.bat +++ /dev/null @@ -1,4 +0,0 @@ -set PATH=C:\Program Files\Python37;C:\Program Files\Python37\Scripts;C:\Program Files\CMake\bin;%PATH% -virtualenv -p "C:\Program Files\Python37\python.exe" . -call .\Scripts\activate -python setup.py bdist_wheel --dist-dir dist3 diff --git a/CI/build-3.9-VS2017.bat b/CI/build-3.9-VS2017.bat new file mode 100644 index 0000000..068b2a4 --- /dev/null +++ b/CI/build-3.9-VS2017.bat @@ -0,0 +1,4 @@ +set PATH=C:\Program Files\Python39;C:\Program Files\Python39\Scripts;C:\Program Files\CMake\bin;%PATH% +virtualenv -p "C:\Program Files\Python39\python.exe" . +call .\Scripts\activate +python setup.py bdist_wheel --dist-dir dist3 diff --git a/CI/deploy-3.7-VS2017.bat b/CI/deploy-3.9-VS2017.bat similarity index 100% rename from CI/deploy-3.7-VS2017.bat rename to CI/deploy-3.9-VS2017.bat diff --git a/CI/test-3.7-VS2017.bat b/CI/test-3.9-VS2017.bat similarity index 57% rename from CI/test-3.7-VS2017.bat rename to CI/test-3.9-VS2017.bat index 0e50e09..ea6b674 100644 --- a/CI/test-3.7-VS2017.bat +++ b/CI/test-3.9-VS2017.bat @@ -1,5 +1,5 @@ -set PATH=C:\Program Files\Python37;C:\Program Files\Python37\Scripts;%PATH% -virtualenv -p "C:\Program Files\Python37\python.exe" . +set PATH=C:\Program Files\Python39;C:\Program Files\Python39\Scripts;%PATH% +virtualenv -p "C:\Program Files\Python39\python.exe" . call .\Scripts\activate python -m pip install numpy==1.19.3 cd dist3 -- GitLab