From 9d4d83ba4522e05a980aebd9f5e2e43c5b30b5c9 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 16:22:47 +0200 Subject: [PATCH 01/14] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8d7bcc9..b8db387 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,8 +18,8 @@ build_script: - git submodule add -b stable ../../pybind/pybind11 extern/pybind11 - git submodule update --init - mkdir build && cd build - - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% -DPYTHON_MODULE=ON ../ + - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% -DPYTHON_WHEEL=ON ../ - cmake --build ./ --config "%CONFIG%" . artifacts: - - path: build\Release\* + - path: build\dist\* From dd0aa4344cddcd171d98df6b304b786c6b8eaf7f Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 16:26:20 +0200 Subject: [PATCH 02/14] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b8db387..631b385 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ build_script: - git submodule update --init - mkdir build && cd build - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% -DPYTHON_WHEEL=ON ../ - - cmake --build ./ --config "%CONFIG%" . +# - cmake --build ./ --config "%CONFIG%" . artifacts: - - path: build\dist\* + - path: build\* From 1486f6bf3db55877913a636dd8bce1f0bfee2a93 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 16:28:21 +0200 Subject: [PATCH 03/14] Update appveyor.yml --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 631b385..e7b0223 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,8 +15,9 @@ install: - set PATH=%Python_ROOT_DIR%;%PATH% build_script: - - git submodule add -b stable ../../pybind/pybind11 extern/pybind11 - - git submodule update --init + - pip install pybind11 +# - git submodule add -b stable ../../pybind/pybind11 extern/pybind11 +# - git submodule update --init - mkdir build && cd build - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% -DPYTHON_WHEEL=ON ../ # - cmake --build ./ --config "%CONFIG%" . From accf00e28f2f4c5828335bffa56ad1477303337f Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 16:50:29 +0200 Subject: [PATCH 04/14] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e7b0223..3eb4947 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,9 +13,9 @@ environment: install: - set PATH=%Python_ROOT_DIR%;%PATH% + - pip install pybind11 build_script: - - pip install pybind11 # - git submodule add -b stable ../../pybind/pybind11 extern/pybind11 # - git submodule update --init - mkdir build && cd build From 1759348f80c01452d028adf3ed31553187d67410 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 16:57:07 +0200 Subject: [PATCH 05/14] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3eb4947..b5bcb7d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,8 +12,9 @@ environment: PYTHON_ARCH: 64 install: - - set PATH=%Python_ROOT_DIR%;%PATH% + - set PATH=%Python_ROOT_DIR%;%Python_ROOT_DIR%\Scripts%PATH% - pip install pybind11 + - pip install wheel build_script: # - git submodule add -b stable ../../pybind/pybind11 extern/pybind11 From cc91e494bf7583246d8a95e5b1476a7b65f43291 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 16:59:45 +0200 Subject: [PATCH 06/14] Update appveyor.yml --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b5bcb7d..b80e36e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,11 +8,10 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 CONFIG: Release PYTHON: "C:\\Python37-x64" - Python_ROOT_DIR: C:\Python37-x64 PYTHON_ARCH: 64 install: - - set PATH=%Python_ROOT_DIR%;%Python_ROOT_DIR%\Scripts%PATH% + - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% - pip install pybind11 - pip install wheel From c8575e410b4c5348470d130f02f724c8a973cea5 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 17:06:10 +0200 Subject: [PATCH 07/14] Update appveyor.yml --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b80e36e..fd6e9fd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,9 @@ environment: PYTHON_ARCH: 64 install: - - set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH% + - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH% + - echo %PATH% + - pip --version - pip install pybind11 - pip install wheel From 09732468687389133a348ed329db418647a3de98 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 17:19:17 +0200 Subject: [PATCH 08/14] Update appveyor.yml --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fd6e9fd..e1ffad4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,20 +8,21 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 CONFIG: Release PYTHON: "C:\\Python37-x64" + PYTHON_EXE: "C:\\Python37-x64\python.exe" PYTHON_ARCH: 64 install: - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH% - - echo %PATH% - pip --version - pip install pybind11 - pip install wheel build_script: + - echo %PATH% # - git submodule add -b stable ../../pybind/pybind11 extern/pybind11 # - git submodule update --init - mkdir build && cd build - - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% -DPYTHON_WHEEL=ON ../ + - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% -D-DPYTHON_EXECUTABLE:%PYTHON_EXE% -DPYTHON_WHEEL=ON ../ # - cmake --build ./ --config "%CONFIG%" . artifacts: From 59760f1d1a2e8f1bbe0ff5e8187335edd113e0ad Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 17:19:39 +0200 Subject: [PATCH 09/14] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e1ffad4..e48821a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 CONFIG: Release PYTHON: "C:\\Python37-x64" - PYTHON_EXE: "C:\\Python37-x64\python.exe" + PYTHON_EXE: "C:\\Python37-x64\\python.exe" PYTHON_ARCH: 64 install: From c168a80a138c814a6ab289b4839745f6b2f67e45 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 17:21:54 +0200 Subject: [PATCH 10/14] Update appveyor.yml --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e48821a..5ef3d26 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,6 +13,7 @@ environment: install: - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH% + - %PYTHON_EXE% --version - pip --version - pip install pybind11 - pip install wheel @@ -22,7 +23,7 @@ build_script: # - git submodule add -b stable ../../pybind/pybind11 extern/pybind11 # - git submodule update --init - mkdir build && cd build - - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% -D-DPYTHON_EXECUTABLE:%PYTHON_EXE% -DPYTHON_WHEEL=ON ../ + - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% -DPYTHON_EXECUTABLE:%PYTHON_EXE% -DPYTHON_WHEEL=ON ../ # - cmake --build ./ --config "%CONFIG%" . artifacts: From 212fd4bf6962f6de0657281590c0d25c8789e543 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 17:24:21 +0200 Subject: [PATCH 11/14] Update appveyor.yml --- appveyor.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5ef3d26..8849db8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,8 +23,9 @@ build_script: # - git submodule add -b stable ../../pybind/pybind11 extern/pybind11 # - git submodule update --init - mkdir build && cd build - - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% -DPYTHON_EXECUTABLE:%PYTHON_EXE% -DPYTHON_WHEEL=ON ../ + - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% ../ + - python setup.py bdist_wheel # - cmake --build ./ --config "%CONFIG%" . -artifacts: - - path: build\* +#artifacts: +# - path: build\* From cbd565d312baeee0856913f038b721f3bc2c97c1 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 17:24:41 +0200 Subject: [PATCH 12/14] Update appveyor.yml --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8849db8..3552b09 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,12 +8,10 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 CONFIG: Release PYTHON: "C:\\Python37-x64" - PYTHON_EXE: "C:\\Python37-x64\\python.exe" PYTHON_ARCH: 64 install: - set PATH=%PYTHON%;%PYTHON%\Scripts;%PATH% - - %PYTHON_EXE% --version - pip --version - pip install pybind11 - pip install wheel From ca79069a0e3cd09e8e65adadaff423e020dff498 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 17:27:22 +0200 Subject: [PATCH 13/14] Update appveyor.yml --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 3552b09..0daba30 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,7 +22,7 @@ build_script: # - git submodule update --init - mkdir build && cd build - cmake -DBUILD_SHARED_LIBS=OFF -DAPPS=OFF -G "Visual Studio 16 2019" -A%PLATFORM% ../ - - python setup.py bdist_wheel + - python ../pymodule/setup.py bdist_wheel # - cmake --build ./ --config "%CONFIG%" . #artifacts: From 63275be7cec24f69b5a1e4a56d1e8394f7995ad9 Mon Sep 17 00:00:00 2001 From: Andrej Prochazka Date: Wed, 19 May 2021 17:28:29 +0200 Subject: [PATCH 14/14] Update appveyor.yml --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0daba30..94811b2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -25,5 +25,5 @@ build_script: - python ../pymodule/setup.py bdist_wheel # - cmake --build ./ --config "%CONFIG%" . -#artifacts: -# - path: build\* +artifacts: + - path: build\dist\*