Merge remote-tracking branch 'origin/master' into openmesh8.1

.gitlab-ci.yml

@@ -15,11 +15,7 @@ build-3.7-VS2017:
   before_script:
     - git submodule sync --recursive
     - git submodule update --init --recursive
-  script:
-    - ' &"set Path=%Path%;C:\Program Files\Python37;C:\Program Files\Python37\Scripts;C:\Program Files\CMake\bin;"'
-    - 'virtualenv.exe --clear -p "C:\Program Files\Python37\python.exe" .'
-    - call .\Scripts\activate
-    - python setup.py bdist_wheel --dist-dir dist3
+  script: "CI\\build-3.7-VS2017.bat"
   artifacts:
     paths:
       - dist3/
@@ -32,7 +28,7 @@ build-3.7-linux:
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
   script:
-    - virtualenv --clear -p python3.7 .
+    - virtualenv -p python3.7 .
     - source bin/activate
     - python setup.py bdist_wheel --dist-dir dist3
   artifacts:
@@ -48,10 +44,7 @@ build-3.5-macos:
     GIT_SUBMODULE_STRATEGY: recursive
   script:
     - export PATH=/opt/local/bin:$PATH
-    - virtualenv --clear -p python3.5 .
-    - pwd
-    - ls
-    - ls /opt/local/bin
+    - virtualenv -p python3.5 .
     - source bin/activate
     - python setup.py bdist_wheel --dist-dir dist3
   artifacts:
@@ -66,7 +59,7 @@ build-2.7-linux:
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
   script:
-    - virtualenv --clear -p python2.7 .
+    - virtualenv -p python2.7 .
     - source bin/activate
     - python setup.py bdist_wheel --dist-dir dist2
   artifacts:
@@ -82,10 +75,7 @@ build-2.7-macos:
     GIT_SUBMODULE_STRATEGY: recursive
   script:
     - export PATH=/opt/local/bin:$PATH
-    - virtualenv --clear -p python2.7 .
-    - pwd
-    - ls
-    - ls /opt/local/bin
+    - virtualenv -p python2.7 .
     - source bin/activate
     - python setup.py bdist_wheel --dist-dir dist2
   artifacts:
@@ -100,14 +90,7 @@ test-3.7-VS2017:
     - python37
   dependencies:
     - build-3.7-VS2017
-  script:
-    - set Path=%Path%;C:\Program Files\Python37;C:\Program Files\Python37\Scripts;
-    - virtualenv.exe --clear -p "C:\Program Files\Python37\python.exe" .
-    - call .\Scripts\activate
-    - cd dist3
-    - FOR %%a IN (*.whl) DO pip install %%a
-    - cd ..\tests
-    - python -m unittest discover
+  script: "CI\\test-3.7-VS2017.bat"
 
 test-3.7-linux:
   stage:
@@ -117,7 +100,7 @@ test-3.7-linux:
   dependencies:
     - build-3.7-linux
   script:
-    - virtualenv --clear -p python3.7 .
+    - virtualenv -p python3.7 .
     - source bin/activate
     - pip install dist3/*.whl
     - cd tests
@@ -132,7 +115,7 @@ test-3.5-macos:
     - build-3.5-macos
   script:
     - export PATH=/opt/local/bin:$PATH
-    - virtualenv --clear -p python3.5 .
+    - virtualenv -p python3.5 .
     - source bin/activate
     - pip install dist3/*.whl
     - cd tests
@@ -146,7 +129,7 @@ test-2.7-linux:
   dependencies:
     - build-2.7-linux
   script:
-    - virtualenv --clear -p python2.7 .
+    - virtualenv -p python2.7 .
     - source bin/activate
     - pip install dist2/*.whl
     - cd tests
@@ -161,7 +144,7 @@ test-2.7-macos:
     - build-2.7-macos
   script:
     - export PATH=/opt/local/bin:$PATH
-    - virtualenv --clear -p python2.7 .
+    - virtualenv -p python2.7 .
     - source bin/activate
     - pip install dist2/*.whl
     - cd tests
@@ -175,10 +158,7 @@ deploy-3.7-VS2017:
     - python37
   dependencies:
     - build-3.7-VS2017
-  script:
-    - mkdir release
-    - cd dist3
-    - FOR %%a IN (*.whl) DO copy %%a ..\release
+  script: "CI\\deploy-3.7-VS2017.bat"
   artifacts:
     paths:
       - release/*.whl
@@ -247,7 +227,7 @@ deploy-sdist:
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
   script:
-    - virtualenv --clear -p python3.7 .
+    - virtualenv -p python3.7 .
     - source bin/activate
     - python setup.py sdist --dist-dir release
   artifacts:
@@ -262,7 +242,7 @@ deploy-documentation:
   dependencies:
     - build-3.7-linux
   script:
-    - virtualenv --clear -p python3.7 .
+    - virtualenv -p python3.7 .
     - source bin/activate
     - pip install dist3/*.whl
     - pip install sphinx sphinx_rtd_theme

CI/build-3.7-VS2017.bat

+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

CI/deploy-3.7-VS2017.bat

+mkdir release
+cd dist3
+FOR %%a IN (*.whl) DO copy %%a ..\release

CI/test-3.7-VS2017.bat

+set PATH=C:\Program Files\Python37;C:\Program Files\Python37\Scripts;%PATH%
+virtualenv -p "C:\Program Files\Python37\python.exe" .
+call .\Scripts\activate
+cd dist3
+FOR %%a IN (*.whl) DO pip install %%a
+cd ..\tests
+python -m unittest discover