Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
d584bcd
implement basic gh action
hobu Aug 3, 2020
03e2327
use correct variable
hobu Aug 3, 2020
e2e5d5f
use conda's compilers
hobu Aug 3, 2020
73ed570
dont install default on win
hobu Aug 3, 2020
dcbfcf8
run windows shell for win build
hobu Aug 3, 2020
7db8dd0
syntax
hobu Aug 3, 2020
8ceeaf7
setup msvc cmd
hobu Aug 3, 2020
a528848
set PDAL_DIR for cmake invocation
hobu Aug 3, 2020
25c4ff3
lint
hobu Aug 3, 2020
608a8c2
more churn
hobu Aug 4, 2020
192d839
continuation
hobu Aug 4, 2020
c52cb6e
mamba
hobu Aug 4, 2020
8722c94
syntax
hobu Aug 4, 2020
e7a61b0
no mamba
hobu Aug 4, 2020
390f468
churn churn
hobu Aug 4, 2020
6f34e62
nmore lint
hobu Aug 4, 2020
09ef188
windows deps
hobu Aug 4, 2020
b7b2e8e
refactor
hobu Aug 4, 2020
e59fcad
install for win
hobu Aug 4, 2020
e437671
try activation
hobu Aug 4, 2020
31fb58e
environment stuff
hobu Aug 4, 2020
dbf0f6f
try activations
hobu Aug 4, 2020
8c126ed
remove activation
hobu Aug 4, 2020
32c9f69
shell invocation
hobu Aug 4, 2020
2135e5b
deck chair rearranging
hobu Aug 4, 2020
238d4b6
chairs
hobu Aug 4, 2020
6d027ef
msvc interfering?
hobu Aug 4, 2020
2f3e125
back up conda action version
hobu Aug 4, 2020
907fa21
syntax
hobu Aug 4, 2020
d4fbefd
explicit activation
hobu Aug 4, 2020
2dbebde
msvc, install
hobu Aug 4, 2020
89c657d
stock install PDAL_DIR path
hobu Aug 4, 2020
6d13344
set msvc ver
hobu Aug 4, 2020
31629f5
syntax
hobu Aug 4, 2020
e9a904d
syntax 2
hobu Aug 4, 2020
9dc5a3b
try conda compilers
hobu Aug 4, 2020
6b0580e
try ninja build
hobu Aug 4, 2020
5ba01ee
explicit CMAKE_GEN
hobu Aug 4, 2020
a2bb5ba
vcvars
hobu Aug 4, 2020
f062b5a
activate
hobu Aug 4, 2020
3f27ba9
syntax
hobu Aug 4, 2020
673f3c4
vcvars
hobu Aug 4, 2020
d454d23
random noise
hobu Aug 4, 2020
76c87c6
I don't understand
hobu Aug 4, 2020
7ad0556
ninja
hobu Aug 4, 2020
2f0cc61
install
hobu Aug 4, 2020
b453220
need cython
hobu Aug 4, 2020
e32d2bf
dist build/distribution
hobu Aug 5, 2020
fb5ed76
bashisms
hobu Aug 5, 2020
ac34229
pytest call
hobu Aug 5, 2020
7ed82df
lint
hobu Aug 5, 2020
9f01d4a
try develop install
hobu Aug 5, 2020
2da2c2c
no direct import
hobu Aug 5, 2020
04aa6ad
remove alternative CI invocations
hobu Aug 5, 2020
16aac5e
Merge remote-tracking branch 'origin/master' into gh-actions
hobu Aug 5, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 139 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
name: Build

on:
pull_request:
branches:
- '*'
push:
branches:
- '*'
release:
types:
- published
jobs:
unix:
name: ${{ matrix.os }} - ${{ matrix.python-version }}

runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: ['ubuntu-latest', 'macos-latest' ]
python-version: ['3.7','3.8']

steps:
- uses: actions/checkout@v2
- uses: goanpeca/setup-miniconda@v1
with:
auto-update-conda: true
python-version: ${{ matrix.python-version }}
activate-environment: test
channels: conda-forge
auto-activate-base: false

- 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

- 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


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.1.2
with:
channels: conda-forge
auto-update-conda: true
python-version: ${{ matrix.python-version }}


- 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 cython ninja pdal pytest conda-build -y

- name: Install
shell: cmd /C CALL "{0}"
run: |

call conda activate test
where python
python setup.py develop -- -G "Ninja"

- name: Test
shell: cmd /C CALL "{0}"
run: |
call conda activate test
set PYTHONHOME=%CONDA_PREFIX%
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
%SKPATH%\cmake-build\pdal_io_numpy_test.exe
pdal --version
pdal --drivers

dist:
name: Distribution
needs: [windows, unix]

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
13 changes: 0 additions & 13 deletions .travis.yml

This file was deleted.

5 changes: 0 additions & 5 deletions azure-pipelines.yml

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/appveyor/build.cmd

This file was deleted.

16 changes: 0 additions & 16 deletions scripts/appveyor/config.cmd

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/appveyor/test.cmd

This file was deleted.

30 changes: 0 additions & 30 deletions scripts/azp/linux.yml

This file was deleted.

46 changes: 0 additions & 46 deletions scripts/azp/osx.yml

This file was deleted.

45 changes: 0 additions & 45 deletions scripts/azp/win.yml

This file was deleted.

5 changes: 0 additions & 5 deletions scripts/travis/script.sh

This file was deleted.