From d584bcdfbfe99f40eac8212141143c2f95cdde11 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 3 Aug 2020 15:24:29 -0500 Subject: [PATCH 01/54] implement basic gh action --- .github/workflows/build.yml | 67 +++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000..e6bbe132 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,67 @@ +name: Build + +on: + pull_request: + branches: + - '*' + push: + branches: + - '*' + +jobs: + conda: + name: ${{ matrix.os }} - ${{ matrix.python-version }} + + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + python-version: ['3.7','3.8'] + + steps: + - uses: actions/checkout@v2 + - uses: goanpeca/setup-miniconda@v1.6.0 + with: + channels: conda-forge + auto-update-conda: true + python-version: ${{ matrix.python-version }} + + - name: Dependencies + shell: bash -l {0} + run: | + conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.os }} ninja pdal pytest conda-build -y + + - name: Install + shell: bash -l {0} + run: | + pip install . + pdal --drivers + + - name: Test + shell: bash -l {0} + run: | + pip install -e . + SKPATH=$(python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())")/cmake-build + export PDAL_DRIVER_PATH=$SKPATH + $SKPATH/pdal_filters_python_test + $SKPATH/pdal_io_numpy_test + py.test + + if: matrix.os != 'windows-latest' + - name: Test + shell: bash -l {0} + run: | + set CC=cl.exe + set CXX=cl.exe + pip install -e . + pytest + for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i + set PDAL_DRIVER_PATH=%SKPATH%\cmake-build + set PYTHONHOME=%CONDA_PREFIX% + %SKPATH%\cmake-build\pdal_filters_python_test.exe + %SKPATH%\cmake-build\pdal_io_numpy_test.exe + pdal --version + pdal --drivers + if: matrix.os == 'windows-latest' + From 03e23276957b02687357d1bb23a7804da9fe2ca7 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 3 Aug 2020 15:26:50 -0500 Subject: [PATCH 02/54] use correct variable --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6bbe132..816a6161 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: - name: Dependencies shell: bash -l {0} run: | - conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.os }} ninja pdal pytest conda-build -y + conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} ninja pdal pytest conda-build -y - name: Install shell: bash -l {0} From e2e5d5f1c6993015feb06ec46f267e745084f672 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 3 Aug 2020 15:36:58 -0500 Subject: [PATCH 03/54] use conda's compilers --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 816a6161..6986c90b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,7 @@ jobs: - name: Dependencies shell: bash -l {0} run: | - conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} ninja pdal pytest conda-build -y + conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install shell: bash -l {0} From 73ed570213206129e5e7259d4a7168de723fd1c3 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 3 Aug 2020 15:56:32 -0500 Subject: [PATCH 04/54] dont install default on win --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6986c90b..9525e474 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,7 @@ jobs: pip install . pdal --drivers + if: matrix.os != 'windows-latest' - name: Test shell: bash -l {0} run: | From dcbfcf80289838f77eabe5b27f1caf26c0615d2d Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 3 Aug 2020 16:05:50 -0500 Subject: [PATCH 05/54] run windows shell for win build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9525e474..fffc8547 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: if: matrix.os != 'windows-latest' - name: Test - shell: bash -l {0} + shell: shell: cmd /C CALL "{0}" run: | set CC=cl.exe set CXX=cl.exe From 7db8dd050c614dab1ce05dc8f45a4ae4cc125f75 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 3 Aug 2020 16:06:15 -0500 Subject: [PATCH 06/54] syntax --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fffc8547..ef3ad147 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,7 +51,7 @@ jobs: if: matrix.os != 'windows-latest' - name: Test - shell: shell: cmd /C CALL "{0}" + shell: cmd /C CALL "{0}" run: | set CC=cl.exe set CXX=cl.exe From 8ceeaf72fc15692fe3c91244aab507e3197e9be8 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 3 Aug 2020 16:18:17 -0500 Subject: [PATCH 07/54] setup msvc cmd --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef3ad147..869cb552 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,6 +50,8 @@ jobs: py.test if: matrix.os != 'windows-latest' + - uses: ilammy/msvc-dev-cmd@v1 + if: matrix.os == 'windows-latest' - name: Test shell: cmd /C CALL "{0}" run: | From a5288483ee304639024bf1ef06afc1ec6a8ebaac Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 3 Aug 2020 16:30:35 -0500 Subject: [PATCH 08/54] set PDAL_DIR for cmake invocation --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 869cb552..8209facb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,7 +57,7 @@ jobs: run: | set CC=cl.exe set CXX=cl.exe - pip install -e . + pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i set PDAL_DRIVER_PATH=%SKPATH%\cmake-build From 25c4ff3c1f467d22ccaad2be591d5dbf7cf307c7 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 3 Aug 2020 16:54:29 -0500 Subject: [PATCH 09/54] lint --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8209facb..eeddee5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -48,15 +48,18 @@ jobs: $SKPATH/pdal_filters_python_test $SKPATH/pdal_io_numpy_test py.test - if: matrix.os != 'windows-latest' + - uses: ilammy/msvc-dev-cmd@v1 if: matrix.os == 'windows-latest' + - name: Test shell: cmd /C CALL "{0}" run: | set CC=cl.exe set CXX=cl.exe + pip install --upgrade pip + set pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i From 608a8c22111cd322108411a0f67debc29e9363fd Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 08:16:59 -0500 Subject: [PATCH 10/54] more churn --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eeddee5b..03112cb5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,11 +55,12 @@ jobs: - name: Test shell: cmd /C CALL "{0}" - run: | + run: >- set CC=cl.exe set CXX=cl.exe pip install --upgrade pip set + conda info pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i From 192d839f6d68460ff43f3526cb4adc5abab52084 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 08:48:19 -0500 Subject: [PATCH 11/54] continuation --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03112cb5..ded82043 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,7 @@ jobs: - name: Test shell: cmd /C CALL "{0}" - run: >- + run: | set CC=cl.exe set CXX=cl.exe pip install --upgrade pip From c52cb6e5372d3b9b58dc70a018de96c592fd47b3 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 09:19:12 -0500 Subject: [PATCH 12/54] mamba --- .github/workflows/build.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ded82043..32990b86 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,11 +26,15 @@ jobs: channels: conda-forge auto-update-conda: true python-version: ${{ matrix.python-version }} + mamba-version: "*" + activate-environment: test + channels: conda-forge,defaults + channel-priority: true - name: Dependencies shell: bash -l {0} run: | - conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y + mamba install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install shell: bash -l {0} @@ -53,14 +57,13 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 if: matrix.os == 'windows-latest' - - name: Test + - name: Test Windows shell: cmd /C CALL "{0}" run: | set CC=cl.exe set CXX=cl.exe pip install --upgrade pip set - conda info pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i From 8722c9446b54eff3351303c374700dbd76c460b0 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 09:19:38 -0500 Subject: [PATCH 13/54] syntax --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 32990b86..b47042b9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,6 @@ jobs: - uses: actions/checkout@v2 - uses: goanpeca/setup-miniconda@v1.6.0 with: - channels: conda-forge auto-update-conda: true python-version: ${{ matrix.python-version }} mamba-version: "*" From e7a61b07dd5650f0f82a7b1f3309cd6dc2cd977a Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 09:23:18 -0500 Subject: [PATCH 14/54] no mamba --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b47042b9..0ba11c84 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: - name: Dependencies shell: bash -l {0} run: | - mamba install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y + conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install shell: bash -l {0} From 390f46811bfe4e8b9b1546b6c8838309828c12e6 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 09:26:32 -0500 Subject: [PATCH 15/54] churn churn --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ba11c84..b2d52e40 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,10 +25,8 @@ jobs: with: auto-update-conda: true python-version: ${{ matrix.python-version }} - mamba-version: "*" activate-environment: test channels: conda-forge,defaults - channel-priority: true - name: Dependencies shell: bash -l {0} From 6f34e62babec6933790cbc27d8ce74144305c8aa Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 09:42:00 -0500 Subject: [PATCH 16/54] nmore lint --- .github/workflows/build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2d52e40..620d9f1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,7 @@ jobs: python-version: ${{ matrix.python-version }} activate-environment: test channels: conda-forge,defaults + auto-activate-base: false - name: Dependencies shell: bash -l {0} @@ -54,12 +55,18 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 if: matrix.os == 'windows-latest' + - name: Cmd.exe + shell: cmd /C CALL {0} + run: >- + conda info && + conda list + if: matrix.os == 'windows-latest' + - name: Test Windows shell: cmd /C CALL "{0}" run: | set CC=cl.exe set CXX=cl.exe - pip install --upgrade pip set pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake pytest From 09ef188dfa18d8fb3a6805845b1e0087327559f8 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 09:55:22 -0500 Subject: [PATCH 17/54] windows deps --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 620d9f1d..c8166b3b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -62,6 +62,10 @@ jobs: conda list if: matrix.os == 'windows-latest' + - name: Windows dependencies + shell: cmd /C CALL {0} + run: | + conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Test Windows shell: cmd /C CALL "{0}" run: | From b7b2e8ee8a7ecc0ca45002d9f1b6ab26fc6d34df Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 10:04:41 -0500 Subject: [PATCH 18/54] refactor --- .github/workflows/build.yml | 40 +++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8166b3b..55c71670 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,14 +9,14 @@ on: - '*' jobs: - conda: + unix: name: ${{ matrix.os }} - ${{ matrix.python-version }} runs-on: ${{ matrix.os }} strategy: fail-fast: true matrix: - os: ['ubuntu-latest', 'macos-latest', 'windows-latest'] + os: ['ubuntu-latest', 'macos-latest' ] python-version: ['3.7','3.8'] steps: @@ -40,7 +40,6 @@ jobs: pip install . pdal --drivers - if: matrix.os != 'windows-latest' - name: Test shell: bash -l {0} run: | @@ -50,23 +49,49 @@ jobs: $SKPATH/pdal_filters_python_test $SKPATH/pdal_io_numpy_test py.test - if: matrix.os != 'windows-latest' + + + windows: + name: ${{ matrix.os }} - ${{ matrix.python-version }} + + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + os: ['windows-latest'] + python-version: ['3.7','3.8'] + + steps: + - uses: actions/checkout@v2 + - uses: goanpeca/setup-miniconda@v1.6.0 + with: + auto-update-conda: true + python-version: ${{ matrix.python-version }} + activate-environment: test + channels: conda-forge,defaults + auto-activate-base: false - uses: ilammy/msvc-dev-cmd@v1 - if: matrix.os == 'windows-latest' - name: Cmd.exe shell: cmd /C CALL {0} run: >- conda info && conda list - if: matrix.os == 'windows-latest' - name: Windows dependencies shell: cmd /C CALL {0} run: | conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - - name: Test Windows + + - name: Install + shell: bash -l {0} + run: | + pip install -e . + pdal --drivers + + + - name: Test shell: cmd /C CALL "{0}" run: | set CC=cl.exe @@ -81,5 +106,4 @@ jobs: %SKPATH%\cmake-build\pdal_io_numpy_test.exe pdal --version pdal --drivers - if: matrix.os == 'windows-latest' From e59fcad304bcb30d2fdeb729b7e24c069831ddde Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 10:14:29 -0500 Subject: [PATCH 19/54] install for win --- .github/workflows/build.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55c71670..0b146b99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,19 +85,16 @@ jobs: conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install - shell: bash -l {0} - run: | - pip install -e . - pdal --drivers - - - - name: Test shell: cmd /C CALL "{0}" run: | set CC=cl.exe set CXX=cl.exe set pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake + + - name: Test + shell: cmd /C CALL "{0}" + run: | pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i set PDAL_DRIVER_PATH=%SKPATH%\cmake-build From e43767137b122a70bab2766bf170496c47924084 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 10:37:10 -0500 Subject: [PATCH 20/54] try activation --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b146b99..626ce50f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -68,7 +68,7 @@ jobs: auto-update-conda: true python-version: ${{ matrix.python-version }} activate-environment: test - channels: conda-forge,defaults + channels: conda-forge auto-activate-base: false - uses: ilammy/msvc-dev-cmd@v1 @@ -76,8 +76,10 @@ jobs: - name: Cmd.exe shell: cmd /C CALL {0} run: >- + conda info && - conda list + conda list && + conda env list - name: Windows dependencies shell: cmd /C CALL {0} @@ -90,6 +92,8 @@ jobs: set CC=cl.exe set CXX=cl.exe set + where pdal + conda activate test pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake - name: Test From 31fb58e07a52d93ac467b1f650f58ee1afd5c808 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 10:47:08 -0500 Subject: [PATCH 21/54] environment stuff --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 626ce50f..fac28b2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,9 +67,7 @@ jobs: with: auto-update-conda: true python-version: ${{ matrix.python-version }} - activate-environment: test channels: conda-forge - auto-activate-base: false - uses: ilammy/msvc-dev-cmd@v1 @@ -93,7 +91,6 @@ jobs: set CXX=cl.exe set where pdal - conda activate test pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake - name: Test From dbf0f6fc1f50d5fa768aa9f3d197e90700ba04fa Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 10:59:58 -0500 Subject: [PATCH 22/54] try activations --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fac28b2f..5b9e6e82 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,6 +82,8 @@ jobs: - name: Windows dependencies shell: cmd /C CALL {0} run: | + conda env list + conda activate test conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install @@ -91,11 +93,14 @@ jobs: set CXX=cl.exe set where pdal + conda env list + conda activate test pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake - name: Test shell: cmd /C CALL "{0}" run: | + conda activate test pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i set PDAL_DRIVER_PATH=%SKPATH%\cmake-build From 8c126eda26b329e5e86cd1501eb2d8b020ed315b Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 11:06:23 -0500 Subject: [PATCH 23/54] remove activation --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5b9e6e82..c197cabc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -83,7 +83,6 @@ jobs: shell: cmd /C CALL {0} run: | conda env list - conda activate test conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install @@ -94,13 +93,11 @@ jobs: set where pdal conda env list - conda activate test pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake - name: Test shell: cmd /C CALL "{0}" run: | - conda activate test pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i set PDAL_DRIVER_PATH=%SKPATH%\cmake-build From 32c9f694aa9a72d6b27e2de19316c4367a3e19d9 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 12:46:09 -0500 Subject: [PATCH 24/54] shell invocation --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c197cabc..414d0366 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,7 @@ jobs: conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install - shell: cmd /C CALL "{0}" + shell: cmd /C CALL {0} run: | set CC=cl.exe set CXX=cl.exe @@ -96,7 +96,7 @@ jobs: pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake - name: Test - shell: cmd /C CALL "{0}" + shell: cmd /C CALL {0} run: | pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i From 2135e5b4a7a910ea65e07bdff8ac5ebc5f5df108 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 12:54:11 -0500 Subject: [PATCH 25/54] deck chair rearranging --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 414d0366..61591925 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,8 +82,8 @@ jobs: - name: Windows dependencies shell: cmd /C CALL {0} run: | - conda env list conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y + conda env list - name: Install shell: cmd /C CALL {0} @@ -92,8 +92,8 @@ jobs: set CXX=cl.exe set where pdal - conda env list pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake + conda env list - name: Test shell: cmd /C CALL {0} From 238d4b677999f34d9c37a9fd582bbfa082dbee64 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 13:05:38 -0500 Subject: [PATCH 26/54] chairs --- .github/workflows/build.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61591925..e8d68468 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: goanpeca/setup-miniconda@v1.6.0 + - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true python-version: ${{ matrix.python-version }} @@ -63,27 +63,27 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: goanpeca/setup-miniconda@v1.6.0 + - uses: ilammy/msvc-dev-cmd@v1 + - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true + activate-environment: test python-version: ${{ matrix.python-version }} channels: conda-forge - - uses: ilammy/msvc-dev-cmd@v1 - name: Cmd.exe shell: cmd /C CALL {0} run: >- conda info && - conda list && - conda env list + conda list - name: Windows dependencies shell: cmd /C CALL {0} run: | + where python conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - conda env list - name: Install shell: cmd /C CALL {0} @@ -91,9 +91,8 @@ jobs: set CC=cl.exe set CXX=cl.exe set - where pdal - pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake - conda env list + where python + python -m pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake - name: Test shell: cmd /C CALL {0} From 6d027ef6364dacb54d2b3f59730eff954794f485 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 13:32:46 -0500 Subject: [PATCH 27/54] msvc interfering? --- .github/workflows/build.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8d68468..1eb8fc6a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,27 +63,26 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: ilammy/msvc-dev-cmd@v1 - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true - activate-environment: test python-version: ${{ matrix.python-version }} - channels: conda-forge - name: Cmd.exe shell: cmd /C CALL {0} - run: >- + run: | - conda info && + conda info conda list + where python - name: Windows dependencies shell: cmd /C CALL {0} run: | where python conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y + where python - name: Install shell: cmd /C CALL {0} From 2f3e125d8ae40915c0c177c8f933754b03028aa8 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 13:46:03 -0500 Subject: [PATCH 28/54] back up conda action version --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1eb8fc6a..dd5a8d4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: goanpeca/setup-miniconda@v1 + - uses: goanpeca/setup-miniconda@v1.3.5 with: auto-update-conda: true python-version: ${{ matrix.python-version }} @@ -73,8 +73,8 @@ jobs: shell: cmd /C CALL {0} run: | - conda info - conda list + conda info && + conda list && where python - name: Windows dependencies From 907fa214840529de2ab5e7a90eda95534b8f1185 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 13:50:12 -0500 Subject: [PATCH 29/54] syntax --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd5a8d4c..d11887b5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -71,7 +71,7 @@ jobs: - name: Cmd.exe shell: cmd /C CALL {0} - run: | + run: >- conda info && conda list && From d4fbefde2be910366922d4c74dbad2b7d8f20057 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 13:59:50 -0500 Subject: [PATCH 30/54] explicit activation --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d11887b5..0c4bccf9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: goanpeca/setup-miniconda@v1.3.5 + - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true python-version: ${{ matrix.python-version }} @@ -75,13 +75,15 @@ jobs: conda info && conda list && + call conda activate test && where python - name: Windows dependencies shell: cmd /C CALL {0} run: | where python - conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y + call conda activate test + conda install -name test --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y where python - name: Install @@ -90,12 +92,14 @@ jobs: set CC=cl.exe set CXX=cl.exe set + call conda activate test where python python -m pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake - name: Test shell: cmd /C CALL {0} run: | + call conda activate test pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i set PDAL_DRIVER_PATH=%SKPATH%\cmake-build From 2dbebde6a0d71cd8573bc3eb7dc4f233ab1e94d0 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 14:04:48 -0500 Subject: [PATCH 31/54] msvc, install --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c4bccf9..02c4bcfb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,6 +63,7 @@ jobs: steps: - uses: actions/checkout@v2 + - uses: ilammy/msvc-dev-cmd@v1 - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true @@ -83,8 +84,7 @@ jobs: run: | where python call conda activate test - conda install -name test --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - where python + conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install shell: cmd /C CALL {0} From 89c657d86d4c65ca6efc6c9e874c5aaa56e96dff Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 14:14:47 -0500 Subject: [PATCH 32/54] stock install PDAL_DIR path --- .github/workflows/build.yml | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02c4bcfb..a964c14b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,20 +69,9 @@ jobs: auto-update-conda: true python-version: ${{ matrix.python-version }} - - - name: Cmd.exe - shell: cmd /C CALL {0} - run: >- - - conda info && - conda list && - call conda activate test && - where python - - - name: Windows dependencies + - name: Dependencies shell: cmd /C CALL {0} run: | - where python call conda activate test conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y @@ -91,10 +80,8 @@ jobs: run: | set CC=cl.exe set CXX=cl.exe - set call conda activate test - where python - python -m pip install -e . -- -DPDAL_DIR=%CONDA_PREFIX%\lib\cmake + python -m pip install -e . - name: Test shell: cmd /C CALL {0} From 6d133443beae5ae0999219370d6078b56ecba0e4 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 14:27:52 -0500 Subject: [PATCH 33/54] set msvc ver --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a964c14b..8f344b47 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,6 +64,7 @@ jobs: steps: - uses: actions/checkout@v2 - uses: ilammy/msvc-dev-cmd@v1 + toolset: 15.9.25 - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true From 31629f5a8c4816e374fef372bb4fa89d4abcdf42 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 14:28:29 -0500 Subject: [PATCH 34/54] syntax --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f344b47..89596485 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: steps: - uses: actions/checkout@v2 - uses: ilammy/msvc-dev-cmd@v1 - toolset: 15.9.25 + toolset: '15.9.25' - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true From e9a904d0d2da7890808fd50b471a9aa918ac88ef Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 14:30:06 -0500 Subject: [PATCH 35/54] syntax 2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 89596485..1860d9dd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: steps: - uses: actions/checkout@v2 - uses: ilammy/msvc-dev-cmd@v1 - toolset: '15.9.25' + toolset: '15.9.25' - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true From 9dc5a3b32cd97e784ef0a0f7ac401472f3194b09 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 14:37:14 -0500 Subject: [PATCH 36/54] try conda compilers --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1860d9dd..8b8f25e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,8 +63,6 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: ilammy/msvc-dev-cmd@v1 - toolset: '15.9.25' - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true From 6b0580e67d6af28ce97acd40378e446d17d716ad Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 14:47:42 -0500 Subject: [PATCH 37/54] try ninja build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8b8f25e1..cc615275 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: set CC=cl.exe set CXX=cl.exe call conda activate test - python -m pip install -e . + python -m pip install -e . -- -G "Ninja" - name: Test shell: cmd /C CALL {0} From 5ba01ee4bc4c89169bdaa8fdcd24a4bfdaa890e4 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 14:59:27 -0500 Subject: [PATCH 38/54] explicit CMAKE_GEN --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cc615275..fc04b0a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,9 @@ jobs: set CC=cl.exe set CXX=cl.exe call conda activate test - python -m pip install -e . -- -G "Ninja" + ninja --help + set CMAKE_GEN=Ninja + python -m pip install -e . - name: Test shell: cmd /C CALL {0} From a2bb5babc36bc4d5312a2d912cf9d03b66e6b982 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 15:09:44 -0500 Subject: [PATCH 39/54] vcvars --- .github/workflows/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc04b0a1..b5b29c59 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,11 +77,14 @@ jobs: - name: Install shell: cmd /C CALL {0} run: | + ECHO ON + call conda activate test set CC=cl.exe set CXX=cl.exe + call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 + call conda activate test - ninja --help - set CMAKE_GEN=Ninja + where python python -m pip install -e . - name: Test From f062b5a37bf63b193d6d7ea30f5f42bf6dd13c7c Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 15:24:17 -0500 Subject: [PATCH 40/54] activate --- .github/workflows/build.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5b29c59..0d4d4ddb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -66,31 +66,36 @@ jobs: - uses: goanpeca/setup-miniconda@v1 with: auto-update-conda: true + activate-environment: test python-version: ${{ matrix.python-version }} + - name: Cmd.exe + shell: cmd /C CALL {0} + run: >- + + conda info --envs && + conda list && + call conda act + - name: Dependencies shell: cmd /C CALL {0} run: | - call conda activate test conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install shell: cmd /C CALL {0} run: | ECHO ON - call conda activate test set CC=cl.exe set CXX=cl.exe - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 + # call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x86_amd64 - call conda activate test where python python -m pip install -e . - name: Test shell: cmd /C CALL {0} run: | - call conda activate test pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i set PDAL_DRIVER_PATH=%SKPATH%\cmake-build From 3f27ba9bba2a8e7493ea02f63c3f11d617144d95 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 15:24:56 -0500 Subject: [PATCH 41/54] syntax --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d4d4ddb..71d888c1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,9 +73,7 @@ jobs: shell: cmd /C CALL {0} run: >- - conda info --envs && - conda list && - call conda act + conda info --envs - name: Dependencies shell: cmd /C CALL {0} From 673f3c4e0349479e155594da80cf5f7f2bca4ede Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 15:42:35 -0500 Subject: [PATCH 42/54] vcvars --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 71d888c1..46d822f1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,7 @@ jobs: ECHO ON set CC=cl.exe set CXX=cl.exe - # call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x86_amd64 + call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x86_amd64 where python python -m pip install -e . From d454d234528bcae41e01e7b19954e57ed01bfc72 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 16:36:18 -0500 Subject: [PATCH 43/54] random noise --- .github/workflows/build.yml | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46d822f1..7d9c6765 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,37 +63,40 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: goanpeca/setup-miniconda@v1 + - uses: goanpeca/setup-miniconda@v1.1.2 with: + channels: conda-forge auto-update-conda: true - activate-environment: test python-version: ${{ matrix.python-version }} - name: Cmd.exe - shell: cmd /C CALL {0} + shell: cmd /C CALL "{0}" run: >- + call conda activate test && conda info --envs - name: Dependencies - shell: cmd /C CALL {0} + shell: cmd /C CALL "{0}" run: | + + call conda activate test + where python conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y - name: Install - shell: cmd /C CALL {0} + shell: cmd /C CALL "{0}" run: | ECHO ON - set CC=cl.exe - set CXX=cl.exe - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat" x86_amd64 + call conda activate test where python - python -m pip install -e . + python -m pip install -e . -t . - name: Test - shell: cmd /C CALL {0} + shell: cmd /C CALL "{0}" run: | + call conda activate test pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i set PDAL_DRIVER_PATH=%SKPATH%\cmake-build From 76c87c6fa1069105b0d7a25cb0c4c345e2aa7f15 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 16:46:52 -0500 Subject: [PATCH 44/54] I don't understand --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d9c6765..d4548dd4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,7 +91,8 @@ jobs: call conda activate test where python - python -m pip install -e . -t . + python -m pip install ninja + python -m pip install -e . - name: Test shell: cmd /C CALL "{0}" From 7ad055661699a9632160a1d0be6a7ba2c60c8578 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 17:01:45 -0500 Subject: [PATCH 45/54] ninja --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d4548dd4..8366fe6e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,7 +92,9 @@ jobs: call conda activate test where python python -m pip install ninja - python -m pip install -e . + where ninja + ninja -h + python -m pip install . - name: Test shell: cmd /C CALL "{0}" From 2f0cc618eb24a93a0e795e58351cba1a8fd74eec Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 17:59:22 -0500 Subject: [PATCH 46/54] install --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8366fe6e..e17659b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,10 +91,7 @@ jobs: call conda activate test where python - python -m pip install ninja - where ninja - ninja -h - python -m pip install . + python setup.py install -- -G "Ninja" - name: Test shell: cmd /C CALL "{0}" From b453220f6d2f8fb6a993c2de58e951fee5f3bab2 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 18:10:33 -0500 Subject: [PATCH 47/54] need cython --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e17659b4..b552b9ef 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: call conda activate test where python - conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers ninja pdal pytest conda-build -y + conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers cython ninja pdal pytest conda-build -y - name: Install shell: cmd /C CALL "{0}" From e32d2bf3276d5f9a9f0d1175f7e6b89fc8faca98 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 20:47:03 -0500 Subject: [PATCH 48/54] dist build/distribution --- .github/workflows/build.yml | 56 +++++++++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b552b9ef..02f6884d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,9 @@ on: push: branches: - '*' - + release: + types: + - published jobs: unix: name: ${{ matrix.os }} - ${{ matrix.python-version }} @@ -69,21 +71,21 @@ jobs: auto-update-conda: true python-version: ${{ matrix.python-version }} - - name: Cmd.exe - shell: cmd /C CALL "{0}" - run: >- - - call conda activate test && - conda info --envs - name: Dependencies - shell: cmd /C CALL "{0}" + shell: bash -l {0} run: | call conda activate test - where python conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers cython ninja pdal pytest conda-build -y + - name: sdist + shell: bash -l {0} + run: | + + call conda activate test + python setup.py sdist + - name: Install shell: cmd /C CALL "{0}" run: | @@ -106,3 +108,39 @@ jobs: pdal --version pdal --drivers + dist: + name: Distribution + + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + os: ['ubuntu-latest'] + python-version: ['3.8'] + + steps: + - uses: actions/checkout@v2 + - uses: goanpeca/setup-miniconda@v1.1.2 + with: + channels: conda-forge + auto-update-conda: true + python-version: ${{ matrix.python-version }} + + - name: Dependencies + shell: bash -l {0} + run: | + conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers cython ninja pdal pytest conda-build -y + + - name: sdist + shell: bash -l {0} + run: | + python setup.py sdist + ls dist + + - uses: pypa/gh-action-pypi-publish@master + name: Publish package + if: github.event_name == 'release' && github.event.action == 'published' + with: + user: __token__ + password: ${{ secrets.pypi_token }} + packages_dir: ./dist From fb5ed760da48354189698fcbcd807419d7e66257 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 20:56:07 -0500 Subject: [PATCH 49/54] bashisms --- .github/workflows/build.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02f6884d..1cef6ae4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -73,19 +73,12 @@ jobs: - name: Dependencies - shell: bash -l {0} + shell: cmd /C CALL "{0}" run: | call conda activate test conda install --yes --quiet -c conda-forge scikit-build numpy python=${{ matrix.python-version }} compilers cython ninja pdal pytest conda-build -y - - name: sdist - shell: bash -l {0} - run: | - - call conda activate test - python setup.py sdist - - name: Install shell: cmd /C CALL "{0}" run: | From ac342296b059d41a45633fd42d7826e96688813e Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 4 Aug 2020 21:22:39 -0500 Subject: [PATCH 50/54] pytest call --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1cef6ae4..70eee42f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,6 @@ jobs: - name: Install shell: cmd /C CALL "{0}" run: | - ECHO ON call conda activate test where python @@ -92,10 +91,10 @@ jobs: shell: cmd /C CALL "{0}" run: | call conda activate test - pytest + set PYTHONHOME=%CONDA_PREFIX% + call pytest for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i set PDAL_DRIVER_PATH=%SKPATH%\cmake-build - set PYTHONHOME=%CONDA_PREFIX% %SKPATH%\cmake-build\pdal_filters_python_test.exe %SKPATH%\cmake-build\pdal_io_numpy_test.exe pdal --version From 7ed82df0c7561ef84e8cb6d4d453a37434a68ec3 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Wed, 5 Aug 2020 09:02:36 -0500 Subject: [PATCH 51/54] lint --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70eee42f..15d83b81 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: auto-update-conda: true python-version: ${{ matrix.python-version }} activate-environment: test - channels: conda-forge,defaults + channels: conda-forge auto-activate-base: false - name: Dependencies @@ -86,13 +86,14 @@ jobs: call conda activate test where python python setup.py install -- -G "Ninja" + python -m pdal - name: Test shell: cmd /C CALL "{0}" run: | call conda activate test set PYTHONHOME=%CONDA_PREFIX% - call pytest + py.test for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i set PDAL_DRIVER_PATH=%SKPATH%\cmake-build %SKPATH%\cmake-build\pdal_filters_python_test.exe From 9f01d4ab4f9464691306c0e91640271b290d0359 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Wed, 5 Aug 2020 09:34:03 -0500 Subject: [PATCH 52/54] try develop install --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15d83b81..0f088bb6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -85,7 +85,7 @@ jobs: call conda activate test where python - python setup.py install -- -G "Ninja" + python setup.py develop -- -G "Ninja" python -m pdal - name: Test @@ -103,6 +103,7 @@ jobs: dist: name: Distribution + needs: [windows, unix] runs-on: ${{ matrix.os }} strategy: From 2da2c2c5902310a6e10f0a2695001c965ecabf27 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Wed, 5 Aug 2020 09:45:32 -0500 Subject: [PATCH 53/54] no direct import --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f088bb6..09df1908 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,6 @@ jobs: call conda activate test where python python setup.py develop -- -G "Ninja" - python -m pdal - name: Test shell: cmd /C CALL "{0}" From 04aa6ad0db38c6777bf6075b9e82d13c68a221a2 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Wed, 5 Aug 2020 11:57:14 -0500 Subject: [PATCH 54/54] remove alternative CI invocations --- .travis.yml | 13 ----------- azure-pipelines.yml | 5 ---- scripts/appveyor/build.cmd | 7 ------ scripts/appveyor/config.cmd | 16 ------------- scripts/appveyor/test.cmd | 3 --- scripts/azp/linux.yml | 30 ------------------------ scripts/azp/osx.yml | 46 ------------------------------------- scripts/azp/win.yml | 45 ------------------------------------ scripts/travis/script.sh | 5 ---- 9 files changed, 170 deletions(-) delete mode 100644 .travis.yml delete mode 100644 azure-pipelines.yml delete mode 100644 scripts/appveyor/build.cmd delete mode 100644 scripts/appveyor/config.cmd delete mode 100644 scripts/appveyor/test.cmd delete mode 100644 scripts/azp/linux.yml delete mode 100644 scripts/azp/osx.yml delete mode 100644 scripts/azp/win.yml delete mode 100755 scripts/travis/script.sh diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5bc813b1..00000000 --- a/.travis.yml +++ /dev/null @@ -1,13 +0,0 @@ -# .travis.yml -# Configure Travis CI service for http://github.com/PDAL/python - -sudo: required - -services: docker - -before_install: - - docker pull pdal/pdal:latest - -script: - - docker run -v $TRAVIS_BUILD_DIR:/pdal -t pdal/pdal:latest /bin/sh -c "/pdal/scripts/travis/script.sh" - diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 7677b24b..00000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,5 +0,0 @@ -jobs: - - template: ./scripts/azp/linux.yml - - template: ./scripts/azp/win.yml - - template: ./scripts/azp/osx.yml - diff --git a/scripts/appveyor/build.cmd b/scripts/appveyor/build.cmd deleted file mode 100644 index 8306aebb..00000000 --- a/scripts/appveyor/build.cmd +++ /dev/null @@ -1,7 +0,0 @@ -call "%CONDA_ROOT%\Scripts\activate.bat" base -call conda install -c conda-forge -y pdal cython packaging - -call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - -python setup.py build - diff --git a/scripts/appveyor/config.cmd b/scripts/appveyor/config.cmd deleted file mode 100644 index 3188a8bc..00000000 --- a/scripts/appveyor/config.cmd +++ /dev/null @@ -1,16 +0,0 @@ -@echo off - -set "CONDA_ROOT=C:\Miniconda3-x64" -set PATH=%CONDA_ROOT%;%CONDA_ROOT%\\scripts;%CONDA_ROOT%\\Library\\bin;%PATH%;C:\\Program Files (x86)\\CMake\\bin -conda config --set always_yes yes -conda config --add channels conda-forge -conda config --set auto_update_conda no -conda config --set channel_priority true -conda update -q --all -conda info -python -c "import sys; print(sys.version)" -python -c "import sys; print(sys.executable)" -python -c "import sys; print(sys.prefix)" - -dir - diff --git a/scripts/appveyor/test.cmd b/scripts/appveyor/test.cmd deleted file mode 100644 index 61c3b221..00000000 --- a/scripts/appveyor/test.cmd +++ /dev/null @@ -1,3 +0,0 @@ -call "%CONDA_ROOT%\Scripts\activate.bat" base - -python setup.py test diff --git a/scripts/azp/linux.yml b/scripts/azp/linux.yml deleted file mode 100644 index 5c94b74a..00000000 --- a/scripts/azp/linux.yml +++ /dev/null @@ -1,30 +0,0 @@ -# -*- mode: yaml -*- - -jobs: -- job: linux - pool: - vmImage: ubuntu-16.04 - timeoutInMinutes: 60 - steps: - - bash: echo "##vso[task.prependpath]$CONDA/bin" - displayName: Add conda to PATH - - script: | - conda update -n base -c defaults conda -y - conda create --yes --name pdal -c conda-forge pdal pytest numpy compilers scikit-build - displayName: 'Dependencies' - - script: | - source activate pdal - echo $CONDA_PREFIX - echo $CONDA_DEFAULT_ENV - pip install . - pdal --drivers - displayName: 'System install' - - script: | - source activate pdal - pip install -e . - SKPATH=$(python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())")/cmake-build - export PDAL_DRIVER_PATH=$SKPATH - $SKPATH/pdal_filters_python_test - $SKPATH/pdal_io_numpy_test - py.test - displayName: 'Local test' diff --git a/scripts/azp/osx.yml b/scripts/azp/osx.yml deleted file mode 100644 index c60fec3d..00000000 --- a/scripts/azp/osx.yml +++ /dev/null @@ -1,46 +0,0 @@ -# -*- mode: yaml -*- - -jobs: -- job: osx - pool: - vmImage: macOS-10.14 - timeoutInMinutes: 360 - steps: - - script: | - echo "Removing homebrew from Azure to avoid conflicts." - curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew - chmod +x ~/uninstall_homebrew - ~/uninstall_homebrew -fq - rm ~/uninstall_homebrew - displayName: Remove homebrew - - bash: | - echo "##vso[task.prependpath]$CONDA/bin" - sudo chown -R $USER $CONDA - displayName: Add conda to PATH - - - script: | - ECHO ON - source activate base - conda update -n base -c defaults conda -y - conda create --yes --quiet --name pdal - displayName: Create conda environment - - - script: | - ECHO ON - source activate pdal - conda install --yes --quiet --name pdal -c conda-forge scikit-build pdal pytest numpy conda-forge-ci-setup=2 -y - displayName: Install PDAL - - - script: | - source activate pdal - pip install -e . - pytest - SKPATH=$(python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())")/cmake-build - export PDAL_DRIVER_PATH=$SKPATH - $SKPATH/pdal_filters_python_test - $SKPATH/pdal_io_numpy_test - pdal --version - pdal --drivers - failOnStderr: true - displayName: 'Local test' - diff --git a/scripts/azp/win.yml b/scripts/azp/win.yml deleted file mode 100644 index 251d4b9e..00000000 --- a/scripts/azp/win.yml +++ /dev/null @@ -1,45 +0,0 @@ - -jobs: -- job: win - - pool: - vmImage: vs2017-win2016 - timeoutInMinutes: 360 - steps: - - powershell: Write-Host "##vso[task.prependpath]$env:CONDA\Scripts" - displayName: Add conda to PATH - - script: | - rmdir C:\strawberry /s /q - continueOnError: true - displayName: remove strawberryperl - - script: | - ECHO ON - call conda update -n base -c defaults conda - call conda create --yes --quiet --name pdal - displayName: Create conda environment - - - script: | - ECHO ON - call activate pdal - call conda config --set always_yes True --set show_channel_urls True - call conda install --yes --quiet --name pdal -c conda-forge scikit-build numpy python=3.8 ninja pdal pytest conda-build -y - displayName: Install PDAL - - script: | - ECHO ON - call activate pdal - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - set CC=cl.exe - set CXX=cl.exe - pip install -e . - pytest - for /f %%i in ('python -c "import skbuild; print (skbuild.constants.SKBUILD_DIR())"') do set SKPATH=%%i - set PDAL_DRIVER_PATH=%SKPATH%\cmake-build - set PYTHONHOME=%CONDA_PREFIX% - %SKPATH%\cmake-build\pdal_filters_python_test.exe - %SKPATH%\cmake-build\pdal_io_numpy_test.exe - pdal --version - pdal --drivers - failOnStderr: true - displayName: 'Local test' - - diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh deleted file mode 100755 index 84f837c6..00000000 --- a/scripts/travis/script.sh +++ /dev/null @@ -1,5 +0,0 @@ -apt-get update -y; apt-get install python3-pip -y -pip3 install numpy packaging cython -cd /pdal/ -python3 setup.py build -python3 setup.py test