From 897e2a4157a9aa7bb061bc92d47a3c0c816092d6 Mon Sep 17 00:00:00 2001 From: rmsare Date: Sun, 20 Oct 2019 13:57:53 -0700 Subject: [PATCH 01/67] Add pymccrgb recipe --- recipes/pymccrgb/meta.yaml | 57 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 recipes/pymccrgb/meta.yaml diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml new file mode 100644 index 0000000000000..cbaa21fdb2df9 --- /dev/null +++ b/recipes/pymccrgb/meta.yaml @@ -0,0 +1,57 @@ +{% set name = "pymccrgb" %} +{% set version = "0.1.4" %} + +package: + name: "{{ name|lower }}" + version: "{{ version }}" + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: 3e9d19dc96b8580e9130cee9527c9f23556a911303815c1414118b5ad942f64a + +build: + noarch: python + number: 0 + script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " + +requirements: + host: + - cmake + - cython + - fiona + - matplotlib + - numpy + - pdal + - pip + - python + - scikit-image + - scikit-learn + - scipy + run: + - cmake + - cython + - fiona + - matplotlib + - numpy + - pdal + - python + - scikit-image + - scikit-learn + - scipy + +test: + imports: + - pymccrgb + +about: + home: https://github.com/rmsare/pymccrgb + license: MIT + license_family: MIT + license_file: LICENSE + summary: A Python package for point cloud classification using color and curvature + doc_url: https://pymccrgb.readthedocs.io + dev_url: https://github.com/rmsare/pymccrgb + +extra: + recipe-maintainers: + - rmsare From 4e1f0518ea44713e1fef743151bdf42a87bd3cb9 Mon Sep 17 00:00:00 2001 From: rmsare Date: Sun, 20 Oct 2019 14:29:45 -0700 Subject: [PATCH 02/67] Replace build script to install dep from from github --- recipes/pymccrgb/build.sh | 4 ++++ recipes/pymccrgb/meta.yaml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 recipes/pymccrgb/build.sh diff --git a/recipes/pymccrgb/build.sh b/recipes/pymccrgb/build.sh new file mode 100644 index 0000000000000..192dccf9ea3de --- /dev/null +++ b/recipes/pymccrgb/build.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +$PYTHON setup.py --quiet install +pip install git+https://github.com/stgl/pymcc diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index cbaa21fdb2df9..8adaa6ae5a3cf 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -12,7 +12,6 @@ source: build: noarch: python number: 0 - script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " requirements: host: From 4016cc85014f58d4d839033cba0862e39880c784 Mon Sep 17 00:00:00 2001 From: rmsare Date: Sun, 20 Oct 2019 14:58:45 -0700 Subject: [PATCH 03/67] Update python in build script --- recipes/pymccrgb/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymccrgb/build.sh b/recipes/pymccrgb/build.sh index 192dccf9ea3de..28e3ac0e4bb0b 100644 --- a/recipes/pymccrgb/build.sh +++ b/recipes/pymccrgb/build.sh @@ -1,4 +1,4 @@ #!/bin/bash -$PYTHON setup.py --quiet install +python setup.py --quiet install pip install git+https://github.com/stgl/pymcc From b5884d9c7af72b407b782f2e71df1bd1313df65e Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Mon, 21 Oct 2019 08:31:06 -0700 Subject: [PATCH 04/67] Enable external dep handling --- recipes/pymccrgb/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymccrgb/build.sh b/recipes/pymccrgb/build.sh index 28e3ac0e4bb0b..5e1216a1f13ae 100644 --- a/recipes/pymccrgb/build.sh +++ b/recipes/pymccrgb/build.sh @@ -1,4 +1,4 @@ #!/bin/bash -python setup.py --quiet install +python setup.py --quiet install --single-version-externally-managed --record=record.txt pip install git+https://github.com/stgl/pymcc From 00c6c3bc944db9bdea8b4e61c7b758f7b6e06107 Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Mon, 21 Oct 2019 08:52:26 -0700 Subject: [PATCH 05/67] Add compilers/cmake to build requirements --- recipes/pymccrgb/meta.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 8adaa6ae5a3cf..6275ce3a47843 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -14,6 +14,10 @@ build: number: 0 requirements: + build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} + - cmake host: - cmake - cython From 418de10dba5e0c0d8062769d2d07c260a4a847b1 Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Mon, 21 Oct 2019 09:10:23 -0700 Subject: [PATCH 06/67] Add LibLas build dependency as a test --- recipes/pymccrgb/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 6275ce3a47843..4308f5dd7e5f9 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -18,6 +18,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake + - liblas host: - cmake - cython From be431a14611dbc61d38b05ed963aeb1274a0b91a Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Mon, 21 Oct 2019 09:17:53 -0700 Subject: [PATCH 07/67] Try to force channel in meta file --- recipes/pymccrgb/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 4308f5dd7e5f9..81f98b81dd4f1 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -18,7 +18,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake - - liblas + - auto::liblas host: - cmake - cython From 015454bffd691049d8e001cb95c4e386815da562 Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Mon, 21 Oct 2019 09:30:28 -0700 Subject: [PATCH 08/67] Try to force channel in meta file, take 2 --- recipes/pymccrgb/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 81f98b81dd4f1..78536e9b59af8 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -18,7 +18,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake - - auto::liblas + - liblas[channel=auto] host: - cmake - cython From 8ed53beeb1b1f1ebffe394cfd503b7fa9ef3fd2e Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Mon, 21 Oct 2019 09:33:36 -0700 Subject: [PATCH 09/67] Add space for pin --- recipes/pymccrgb/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 78536e9b59af8..294379a1c2e55 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -18,7 +18,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake - - liblas[channel=auto] + - liblas[channel =auto] host: - cmake - cython From 403b176568e5ad09da46a6b74b5d6ea73f9a8141 Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Mon, 21 Oct 2019 09:39:33 -0700 Subject: [PATCH 10/67] Try quoting pinned dependency --- recipes/pymccrgb/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 294379a1c2e55..603a958034b89 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -18,7 +18,7 @@ requirements: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake - - liblas[channel =auto] + - 'liblas[channel=auto]' host: - cmake - cython From f5a4d2852be4a3c5df54db72af06c925b5731714 Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Mon, 21 Oct 2019 10:05:56 -0700 Subject: [PATCH 11/67] Try specifying channel in extra --- recipes/pymccrgb/meta.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 603a958034b89..4991a7e40b991 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -13,12 +13,17 @@ build: noarch: python number: 0 +extra: + channels: + - auto + - conda-forge + requirements: build: - {{ compiler('c') }} - {{ compiler('cxx') }} - cmake - - 'liblas[channel=auto]' + - liblas host: - cmake - cython From 848440d31194105db9bd17c2d062f06fbb28e45b Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Mon, 21 Oct 2019 10:17:42 -0700 Subject: [PATCH 12/67] Remove extras/channels, keep liblas --- recipes/pymccrgb/meta.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 4991a7e40b991..4308f5dd7e5f9 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -13,11 +13,6 @@ build: noarch: python number: 0 -extra: - channels: - - auto - - conda-forge - requirements: build: - {{ compiler('c') }} From 0d32c685f8848cf6e1ccff3b888c4e6446d50a13 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 15:34:28 -0700 Subject: [PATCH 13/67] Add liblas recipe --- recipes/liblas/bld.bat | 1 + recipes/liblas/build.sh | 1 + recipes/liblas/meta.yaml | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 recipes/liblas/bld.bat create mode 100644 recipes/liblas/build.sh create mode 100644 recipes/liblas/meta.yaml diff --git a/recipes/liblas/bld.bat b/recipes/liblas/bld.bat new file mode 100644 index 0000000000000..3ff55bc319a09 --- /dev/null +++ b/recipes/liblas/bld.bat @@ -0,0 +1 @@ +pip install libLAS diff --git a/recipes/liblas/build.sh b/recipes/liblas/build.sh new file mode 100644 index 0000000000000..3ff55bc319a09 --- /dev/null +++ b/recipes/liblas/build.sh @@ -0,0 +1 @@ +pip install libLAS diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml new file mode 100644 index 0000000000000..3329b8bc86d85 --- /dev/null +++ b/recipes/liblas/meta.yaml @@ -0,0 +1,39 @@ +{% set name = "liblas" %} +{% set version = "1.8.1" %} + +package: + name: "{{ name|lower }}" + version: "{{ version }}" + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: 4d517670912989a0c7a33bb057167747e1013db6abdaa372f0775343ff0d1e16 + +build: + number: 0 + +requirements: + host: + - pip + - python + - setuptools + run: + - python + - setuptools + +test: + imports: + - liblas + +about: + home: http://liblas.org + license: BSD + license_family: BSD + license_file: LICENSE.txt + summary: LAS 1.0/1.1/1.2 LiDAR data format translation + doc_url: https://liblas.org + dev_url: https://github.com/liblas/libas + +extra: + recipe-maintainers: + - rmsare From 96bcd12263b723a21288e9d80c65fabcaa2e21f3 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 15:45:56 -0700 Subject: [PATCH 14/67] Update name to libLAS to fix pypi URL --- recipes/liblas/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 3329b8bc86d85..92fbc143f4883 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -1,4 +1,4 @@ -{% set name = "liblas" %} +{% set name = "libLAS" %} {% set version = "1.8.1" %} package: From 2f34ec933c675c8c05b44b9e2a3afab264d2c435 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 15:58:30 -0700 Subject: [PATCH 15/67] Remove build scripts for liblas --- recipes/liblas/bld.bat | 1 - recipes/liblas/build.sh | 1 - recipes/liblas/meta.yaml | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 recipes/liblas/bld.bat delete mode 100644 recipes/liblas/build.sh diff --git a/recipes/liblas/bld.bat b/recipes/liblas/bld.bat deleted file mode 100644 index 3ff55bc319a09..0000000000000 --- a/recipes/liblas/bld.bat +++ /dev/null @@ -1 +0,0 @@ -pip install libLAS diff --git a/recipes/liblas/build.sh b/recipes/liblas/build.sh deleted file mode 100644 index 3ff55bc319a09..0000000000000 --- a/recipes/liblas/build.sh +++ /dev/null @@ -1 +0,0 @@ -pip install libLAS diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 92fbc143f4883..d05f731bd438d 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -11,6 +11,7 @@ source: build: number: 0 + script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " requirements: host: From e77ce9af627816dbac681bbcad28b7ae88a5e1d6 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 16:19:37 -0700 Subject: [PATCH 16/67] Use github release link + SHA, which includes LICENSE.txt --- recipes/liblas/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index d05f731bd438d..6325c869b05d0 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -6,8 +6,8 @@ package: version: "{{ version }}" source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 4d517670912989a0c7a33bb057167747e1013db6abdaa372f0775343ff0d1e16 + url: https://github.com/libLAS/libLAS/archive/1.8.1.tar.gz + sha256: 31cff4fd235f9397df8c3086b0aefc50a047d2be0e9ce39f0cddfc662633fa93 build: number: 0 From cf36c6acb3abd4207b703cbbae78194b8d0ee7ed Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 16:34:14 -0700 Subject: [PATCH 17/67] Try to install directly from git --- recipes/liblas/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 6325c869b05d0..f71c1c5ce6094 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -6,8 +6,8 @@ package: version: "{{ version }}" source: - url: https://github.com/libLAS/libLAS/archive/1.8.1.tar.gz - sha256: 31cff4fd235f9397df8c3086b0aefc50a047d2be0e9ce39f0cddfc662633fa93 + git_rev: v1.8.1 + git_url: https://github.com/liblas/liblas.git build: number: 0 From 68d942e52db817c1a030d9c1bb897f11fd38ef73 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 16:35:53 -0700 Subject: [PATCH 18/67] Scratch that - move into source directory --- recipes/liblas/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index f71c1c5ce6094..e1a756ea55428 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -6,12 +6,12 @@ package: version: "{{ version }}" source: - git_rev: v1.8.1 - git_url: https://github.com/liblas/liblas.git + url: https://github.com/libLAS/libLAS/archive/1.8.1.tar.gz + sha256: 31cff4fd235f9397df8c3086b0aefc50a047d2be0e9ce39f0cddfc662633fa93 build: number: 0 - script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " + script: "cd LibLAS-1.8.1/python && {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " requirements: host: @@ -30,7 +30,7 @@ about: home: http://liblas.org license: BSD license_family: BSD - license_file: LICENSE.txt + license_file: LibLAS-1.8.1/LICENSE.txt summary: LAS 1.0/1.1/1.2 LiDAR data format translation doc_url: https://liblas.org dev_url: https://github.com/liblas/libas From 8eeb53c00beb6569b7056adf1bd5749a361a164b Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 16:40:43 -0700 Subject: [PATCH 19/67] Fix typo in libLAS --- recipes/liblas/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index e1a756ea55428..d533b01d00a7f 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -11,7 +11,7 @@ source: build: number: 0 - script: "cd LibLAS-1.8.1/python && {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " + script: "cd libLAS-1.8.1/python && {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " requirements: host: From f13c4d0aea2b9b3fedb09f04da9ea4536025e766 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 16:41:02 -0700 Subject: [PATCH 20/67] Fix typo in libLAS --- recipes/liblas/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index d533b01d00a7f..e49b226d89c0c 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -30,7 +30,7 @@ about: home: http://liblas.org license: BSD license_family: BSD - license_file: LibLAS-1.8.1/LICENSE.txt + license_file: libLAS-1.8.1/LICENSE.txt summary: LAS 1.0/1.1/1.2 LiDAR data format translation doc_url: https://liblas.org dev_url: https://github.com/liblas/libas From 7e2992a31f24451b9f0745e82a4dc5846cf3ea0e Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 16:48:43 -0700 Subject: [PATCH 21/67] cd into python source dir only --- recipes/liblas/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index e49b226d89c0c..5229e8610a3c6 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -11,7 +11,7 @@ source: build: number: 0 - script: "cd libLAS-1.8.1/python && {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " + script: "cd python && {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " requirements: host: From d5d505b9d1080b9bef69606dfcbe054e89dcd015 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 16:57:04 -0700 Subject: [PATCH 22/67] Fix license path --- recipes/liblas/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 5229e8610a3c6..8b4a9a9521201 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -30,7 +30,7 @@ about: home: http://liblas.org license: BSD license_family: BSD - license_file: libLAS-1.8.1/LICENSE.txt + license_file: LICENSE.txt summary: LAS 1.0/1.1/1.2 LiDAR data format translation doc_url: https://liblas.org dev_url: https://github.com/liblas/libas From cac38fb40a6d22b778e1837351d71cec105fdcd1 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 17:10:35 -0700 Subject: [PATCH 23/67] Try to compile from source --- recipes/liblas/build.sh | 7 +++++++ recipes/liblas/meta.yaml | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 recipes/liblas/build.sh diff --git a/recipes/liblas/build.sh b/recipes/liblas/build.sh new file mode 100644 index 0000000000000..e9937c7acfb43 --- /dev/null +++ b/recipes/liblas/build.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +cd libLAS-1.8.1/ +mkdir makefiles +cd makefiles +cmake -G "Unix Makefiles" ../ +make && make install diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 8b4a9a9521201..936531e4ff8a5 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -11,7 +11,6 @@ source: build: number: 0 - script: "cd python && {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " requirements: host: From f712ab9c1471c58322eef5d2463ff570ea316966 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 17:17:36 -0700 Subject: [PATCH 24/67] Dont go into source dir --- recipes/liblas/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/liblas/build.sh b/recipes/liblas/build.sh index e9937c7acfb43..46219db75c948 100644 --- a/recipes/liblas/build.sh +++ b/recipes/liblas/build.sh @@ -1,6 +1,5 @@ #!/bin/bash -cd libLAS-1.8.1/ mkdir makefiles cd makefiles cmake -G "Unix Makefiles" ../ From bc8e7ee281b536daf6d8284e7dd5c0176ab9d2f5 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 17:23:48 -0700 Subject: [PATCH 25/67] Add cmake to build deps --- recipes/liblas/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 936531e4ff8a5..16446eec0d9b1 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -13,6 +13,8 @@ build: number: 0 requirements: + build: + - cmake host: - pip - python From a3b8db42e89d566272fb361ba26f29222bcdb8c3 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 18:27:25 -0700 Subject: [PATCH 26/67] Add compilers to build deps --- recipes/liblas/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 16446eec0d9b1..5ea285fe7a91c 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -14,6 +14,8 @@ build: requirements: build: + - {{ compiler ('c') }} + - {{ compiler ('cxx') }} - cmake host: - pip From 5c82524ff049c9f34b30a4c85fe22e5522c9fee8 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 18:34:48 -0700 Subject: [PATCH 27/67] Add boost to build deps --- recipes/liblas/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 5ea285fe7a91c..b36ad34380170 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -16,6 +16,7 @@ requirements: build: - {{ compiler ('c') }} - {{ compiler ('cxx') }} + - boost - cmake host: - pip From 66be37e9a02d195b7972b223ff322679e935d680 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 18:52:05 -0700 Subject: [PATCH 28/67] Add more build deps --- recipes/liblas/meta.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index b36ad34380170..c5da76a1a8164 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -17,6 +17,9 @@ requirements: - {{ compiler ('c') }} - {{ compiler ('cxx') }} - boost + - geotiff + - gdal + - proj4 - cmake host: - pip From 5f2b0439b540ea92b8c5c1eeb9217642d7a42ba7 Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 19:11:07 -0700 Subject: [PATCH 29/67] Try to add libstdc++ --- recipes/liblas/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index c5da76a1a8164..f0b774d9cc7e3 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -20,6 +20,7 @@ requirements: - geotiff - gdal - proj4 + - libstdcxx-ng - cmake host: - pip From 62d900d4074046aee200aa9b6be14b2c5ce02d6f Mon Sep 17 00:00:00 2001 From: rmsare Date: Mon, 21 Oct 2019 20:59:54 -0700 Subject: [PATCH 30/67] try to fix glibcxx issue by adding gcc libs --- recipes/liblas/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index f0b774d9cc7e3..a3478ad4607cd 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -21,6 +21,7 @@ requirements: - gdal - proj4 - libstdcxx-ng + - libgcc - cmake host: - pip From 24a6a955496df90b18f240da8accc6eea6057c0c Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 21 Oct 2019 23:13:30 -0500 Subject: [PATCH 31/67] Fix deps --- recipes/liblas/meta.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index a3478ad4607cd..074cd0b68bfa8 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -16,17 +16,16 @@ requirements: build: - {{ compiler ('c') }} - {{ compiler ('cxx') }} - - boost - - geotiff - - gdal - - proj4 - - libstdcxx-ng - - libgcc - cmake + - make host: - pip - python - setuptools + - boost + - geotiff + - gdal + - proj4 run: - python - setuptools From f4da1c2e876bf469d57be2e792aa0b20bdbca1d0 Mon Sep 17 00:00:00 2001 From: Isuru Fernando Date: Mon, 21 Oct 2019 23:21:28 -0500 Subject: [PATCH 32/67] Fix build script --- recipes/liblas/build.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/recipes/liblas/build.sh b/recipes/liblas/build.sh index 46219db75c948..21279be75a981 100644 --- a/recipes/liblas/build.sh +++ b/recipes/liblas/build.sh @@ -1,6 +1,15 @@ #!/bin/bash -mkdir makefiles -cd makefiles -cmake -G "Unix Makefiles" ../ -make && make install +mkdir build +cd build + +cmake -G "Unix Makefiles" \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DCMAKE_PREFIX_PATH=$PREFIX \ + -DBoost_USE_STATIC_LIBS=no \ + .. + +make -j${CPU_COUNT} +make install From 408a84a5fd178335bf28b9e9e2ac9457e501bf3e Mon Sep 17 00:00:00 2001 From: rmsare Date: Tue, 22 Oct 2019 10:06:40 -0700 Subject: [PATCH 33/67] Add boost-cpp to deps, update run deps --- recipes/liblas/meta.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 074cd0b68bfa8..166f529b22a23 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -23,12 +23,18 @@ requirements: - python - setuptools - boost + - boost-cpp - geotiff - gdal - proj4 run: - python - setuptools + - boost + - boost-cpp + - geotiff + - gdal + - proj4 test: imports: From f0e1d70b0ac9d9da4331e19abc578adad2ffd9fd Mon Sep 17 00:00:00 2001 From: rmsare Date: Tue, 22 Oct 2019 10:40:32 -0700 Subject: [PATCH 34/67] Install Python bindings in build script --- recipes/liblas/build.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/recipes/liblas/build.sh b/recipes/liblas/build.sh index 21279be75a981..20ff8c268cc60 100644 --- a/recipes/liblas/build.sh +++ b/recipes/liblas/build.sh @@ -1,5 +1,6 @@ #!/bin/bash +# Compile C library mkdir build cd build @@ -13,3 +14,7 @@ cmake -G "Unix Makefiles" \ make -j${CPU_COUNT} make install + +# Install Python bindings +cd ../python +python -m pip install . From 7f4c833404af018e84eefc301817538f317f31ee Mon Sep 17 00:00:00 2001 From: rmsare Date: Tue, 22 Oct 2019 12:12:14 -0700 Subject: [PATCH 35/67] Add pip to deps, remove pip install of pymcc --- recipes/pymccrgb/build.sh | 1 - recipes/pymccrgb/meta.yaml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/pymccrgb/build.sh b/recipes/pymccrgb/build.sh index 5e1216a1f13ae..f83a7248102d3 100644 --- a/recipes/pymccrgb/build.sh +++ b/recipes/pymccrgb/build.sh @@ -1,4 +1,3 @@ #!/bin/bash python setup.py --quiet install --single-version-externally-managed --record=record.txt -pip install git+https://github.com/stgl/pymcc diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 4308f5dd7e5f9..8fd05cab2ab2e 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -20,6 +20,7 @@ requirements: - cmake - liblas host: + - boost - cmake - cython - fiona @@ -32,6 +33,7 @@ requirements: - scikit-learn - scipy run: + - boost - cmake - cython - fiona From 093f2ab929ccac117f6fc395605590d6034eed69 Mon Sep 17 00:00:00 2001 From: rmsare Date: Tue, 22 Oct 2019 13:50:06 -0700 Subject: [PATCH 36/67] Use PYTHON in build scripts --- recipes/liblas/build.sh | 2 +- recipes/pymccrgb/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/liblas/build.sh b/recipes/liblas/build.sh index 20ff8c268cc60..a2e6a4b5da32c 100644 --- a/recipes/liblas/build.sh +++ b/recipes/liblas/build.sh @@ -17,4 +17,4 @@ make install # Install Python bindings cd ../python -python -m pip install . +$PYTHON -m pip install . diff --git a/recipes/pymccrgb/build.sh b/recipes/pymccrgb/build.sh index f83a7248102d3..e483bb2d39c7d 100644 --- a/recipes/pymccrgb/build.sh +++ b/recipes/pymccrgb/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -python setup.py --quiet install --single-version-externally-managed --record=record.txt +$PYTHON setup.py --quiet install --single-version-externally-managed --record=record.txt From f61aadda8740ec44593b176e70337122005e1767 Mon Sep 17 00:00:00 2001 From: rmsare Date: Tue, 22 Oct 2019 13:53:08 -0700 Subject: [PATCH 37/67] Use setup.py to build liblas --- recipes/liblas/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/liblas/build.sh b/recipes/liblas/build.sh index a2e6a4b5da32c..141dec92c2494 100644 --- a/recipes/liblas/build.sh +++ b/recipes/liblas/build.sh @@ -17,4 +17,4 @@ make install # Install Python bindings cd ../python -$PYTHON -m pip install . +$PYTHON setup.py --quiet install --single-version-externally-managed --record=record.txt From bc332bed02d7ed105733f19a37dca386807dcdaa Mon Sep 17 00:00:00 2001 From: rmsare Date: Tue, 22 Oct 2019 15:55:21 -0700 Subject: [PATCH 38/67] Bump version and trigger CI to check license file --- recipes/pymccrgb/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 8fd05cab2ab2e..1683b1278871c 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pymccrgb" %} -{% set version = "0.1.4" %} +{% set version = "0.1.5" %} package: name: "{{ name|lower }}" From 0aa6226c00e8350d355c9084755c92fddd28ba1f Mon Sep 17 00:00:00 2001 From: rmsare Date: Wed, 23 Oct 2019 08:50:46 -0700 Subject: [PATCH 39/67] Update pymccrgb hash for 0.1.5 --- recipes/pymccrgb/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 1683b1278871c..cd6c4d25c089d 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 3e9d19dc96b8580e9130cee9527c9f23556a911303815c1414118b5ad942f64a + sha256: 17119579f934016e4561b032186d7c834a2ae9e61e26accbb94313cc92b3f39e build: noarch: python From 926f0a3f0ae883bf7a90341f5a197b08705937d0 Mon Sep 17 00:00:00 2001 From: rmsare Date: Wed, 23 Oct 2019 11:15:59 -0700 Subject: [PATCH 40/67] Add install of pymcc to check build --- recipes/pymccrgb/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/pymccrgb/build.sh b/recipes/pymccrgb/build.sh index e483bb2d39c7d..d03435444264c 100644 --- a/recipes/pymccrgb/build.sh +++ b/recipes/pymccrgb/build.sh @@ -1,3 +1,4 @@ #!/bin/bash +$PYTHON -m pip install git+https://github.com/stgl/pymcc $PYTHON setup.py --quiet install --single-version-externally-managed --record=record.txt From 158bafee0be9451ffb793865abd94167d1acb01a Mon Sep 17 00:00:00 2001 From: rmsare Date: Wed, 23 Oct 2019 17:35:39 -0700 Subject: [PATCH 41/67] Add recipe for pymcc_lidar (aka pymcc) --- recipes/pymcc_lidar/build.sh | 5 ++++ recipes/pymcc_lidar/meta.yaml | 54 +++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 recipes/pymcc_lidar/build.sh create mode 100644 recipes/pymcc_lidar/meta.yaml diff --git a/recipes/pymcc_lidar/build.sh b/recipes/pymcc_lidar/build.sh new file mode 100644 index 0000000000000..f7d50c196fe68 --- /dev/null +++ b/recipes/pymcc_lidar/build.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +export PYTHON_EXECUTABLE=$CONDA_PYTHON_EXE + +$PYTHON -m pip install pymcc_lidar diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml new file mode 100644 index 0000000000000..8b7a0645cb8c4 --- /dev/null +++ b/recipes/pymcc_lidar/meta.yaml @@ -0,0 +1,54 @@ +{% set name = "pymcc_lidar" %} +{% set version = "1.2" %} + +package: + name: "{{ name|lower }}" + version: "{{ version }}" + +source: + url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz + sha256: 723d399a3cc21cb8551f6377df4c92b7802175e74d2e02857fd76c7f41c28dc1 + +build: + number: 0 + script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " + +requirements: + build: + - cmake + - cython + - pip + - python + - liblas + - numpy + host: + - cmake + - cython + - pip + - python + - liblas + - numpy + run: + - cmake + - cython + - python + - liblas + - numpy + +test: + imports: + - . + +about: + home: https://github.com/stgl/pymcc + license: MIT + license_family: MIT + license_file: LICENSE + summary: A Python package for point cloud classification using relative height + doc_url: https://github.com/stgl/pymcc + dev_url: https://github.com/stgl/pymcc + +extra: + recipe-maintainers: + - rmsare + - gehilley From ece3ccab282d7654a9015e146e57d3be3ec8acfc Mon Sep 17 00:00:00 2001 From: rmsare Date: Thu, 24 Oct 2019 08:10:19 -0700 Subject: [PATCH 42/67] Update deps - attempt to fix numpy conflixt --- recipes/pymcc_lidar/build.sh | 2 +- recipes/pymcc_lidar/meta.yaml | 3 +-- recipes/pymccrgb/build.sh | 1 - recipes/pymccrgb/meta.yaml | 6 ++++++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/recipes/pymcc_lidar/build.sh b/recipes/pymcc_lidar/build.sh index f7d50c196fe68..8bde9aff4887e 100644 --- a/recipes/pymcc_lidar/build.sh +++ b/recipes/pymcc_lidar/build.sh @@ -2,4 +2,4 @@ export PYTHON_EXECUTABLE=$CONDA_PYTHON_EXE -$PYTHON -m pip install pymcc_lidar +$PYTHON setup.py --quiet install --single-version-externally-managed --record=record.txt diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index 8b7a0645cb8c4..c52d903c455be 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -11,7 +11,6 @@ source: build: number: 0 - script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed -vv " requirements: build: @@ -37,7 +36,7 @@ requirements: test: imports: - - . + - pymcc_lidar about: home: https://github.com/stgl/pymcc diff --git a/recipes/pymccrgb/build.sh b/recipes/pymccrgb/build.sh index d03435444264c..e483bb2d39c7d 100644 --- a/recipes/pymccrgb/build.sh +++ b/recipes/pymccrgb/build.sh @@ -1,4 +1,3 @@ #!/bin/bash -$PYTHON -m pip install git+https://github.com/stgl/pymcc $PYTHON setup.py --quiet install --single-version-externally-managed --record=record.txt diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index cd6c4d25c089d..6661a60e6b2f0 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -19,16 +19,19 @@ requirements: - {{ compiler('cxx') }} - cmake - liblas + - pymcc_lidar host: - boost - cmake - cython - fiona + - liblas - matplotlib - numpy - pdal - pip - python + - pymcc_lidar - scikit-image - scikit-learn - scipy @@ -37,10 +40,13 @@ requirements: - cmake - cython - fiona + - liblas - matplotlib - numpy - pdal + - pip - python + - pymcc_lidar - scikit-image - scikit-learn - scipy From 872c6e2ece74a4e45aa31da4c1f6803f9a414b11 Mon Sep 17 00:00:00 2001 From: rmsare Date: Thu, 24 Oct 2019 09:50:19 -0700 Subject: [PATCH 43/67] Try to pin numpy to fix liblas/numpy conflict --- recipes/pymcc_lidar/meta.yaml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index c52d903c455be..d6f2f48b51bbb 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -16,23 +16,19 @@ requirements: build: - cmake - cython - - pip - - python - - liblas - - numpy host: - - cmake - - cython - pip - python + - setuptools + - cython - liblas - - numpy + - numpy >=1.14.6 run: - cmake - cython - python - liblas - - numpy + - numpy >=1.14.6 test: imports: From 296a7dceb997e2a3cbbbd8686674b3d22fe9309d Mon Sep 17 00:00:00 2001 From: rmsare Date: Thu, 24 Oct 2019 13:07:11 -0700 Subject: [PATCH 44/67] Bump pymcc_lidar version to fetch full tarball from PyPI --- recipes/pymcc_lidar/meta.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index d6f2f48b51bbb..2606b7f046e16 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pymcc_lidar" %} -{% set version = "1.2" %} +{% set version = "1.3" %} package: name: "{{ name|lower }}" @@ -20,13 +20,8 @@ requirements: - pip - python - setuptools - - cython - - liblas - - numpy >=1.14.6 run: - - cmake - cython - - python - liblas - numpy >=1.14.6 From a3002d10cc1bb62aefe6296be8c14a8e8783039d Mon Sep 17 00:00:00 2001 From: rmsare Date: Thu, 24 Oct 2019 13:08:22 -0700 Subject: [PATCH 45/67] Bump version but don't update deps (for now) --- recipes/pymcc_lidar/meta.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index 2606b7f046e16..8683d35cfc2ae 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -16,12 +16,20 @@ requirements: build: - cmake - cython + - pip + - python + - liblas host: + - cmake + - cython - pip - python - - setuptools + - liblas + - numpy >=1.14.6 run: + - cmake - cython + - python - liblas - numpy >=1.14.6 From 7d5008ef51ec6c87a8f48cd5053655fade8b3581 Mon Sep 17 00:00:00 2001 From: rmsare Date: Thu, 24 Oct 2019 14:53:22 -0700 Subject: [PATCH 46/67] Update pymcc-lidar hash --- recipes/pymcc_lidar/meta.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index 8683d35cfc2ae..946aebfebd3f3 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 723d399a3cc21cb8551f6377df4c92b7802175e74d2e02857fd76c7f41c28dc1 + sha256: 50553515bdfbb9203e260bade29ac4d7bf7e690ed5d873ccd6be7c2f5530025b build: number: 0 @@ -16,20 +16,13 @@ requirements: build: - cmake - cython - - pip - - python - liblas host: - - cmake - - cython - pip - python - liblas - numpy >=1.14.6 run: - - cmake - - cython - - python - liblas - numpy >=1.14.6 From 64541bbdd9af6445fa3ee34510215ed8a463486f Mon Sep 17 00:00:00 2001 From: rmsare Date: Thu, 24 Oct 2019 16:12:18 -0700 Subject: [PATCH 47/67] Add compilers to recipe --- recipes/pymcc_lidar/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index 946aebfebd3f3..0f06a57c50f7e 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -14,6 +14,8 @@ build: requirements: build: + - {{ compiler('c') }} + - {{ compiler('cxx') }} - cmake - cython - liblas From bd9424dbcf92fb5150dfabbad2af160c0eda2e7b Mon Sep 17 00:00:00 2001 From: rmsare Date: Thu, 24 Oct 2019 17:52:41 -0700 Subject: [PATCH 48/67] Add python to reqs/run --- recipes/pymcc_lidar/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index 0f06a57c50f7e..bbc049fbb0f65 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -25,6 +25,7 @@ requirements: - liblas - numpy >=1.14.6 run: + - python - liblas - numpy >=1.14.6 From ff8b5bac8c7e1fc192ccc119bac1791e32a9064a Mon Sep 17 00:00:00 2001 From: rmsare Date: Thu, 24 Oct 2019 20:50:48 -0700 Subject: [PATCH 49/67] Fix license file name --- recipes/pymcc_lidar/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index bbc049fbb0f65..2ab8264ddd9c7 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -37,7 +37,7 @@ about: home: https://github.com/stgl/pymcc license: MIT license_family: MIT - license_file: LICENSE + license_file: LICENSE.txt summary: A Python package for point cloud classification using relative height doc_url: https://github.com/stgl/pymcc dev_url: https://github.com/stgl/pymcc From f62240469f606b8c1b04d626493e772b851ebaad Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 07:48:06 -0700 Subject: [PATCH 50/67] Use version string --- recipes/liblas/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 166f529b22a23..2a3af961cd510 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -6,7 +6,7 @@ package: version: "{{ version }}" source: - url: https://github.com/libLAS/libLAS/archive/1.8.1.tar.gz + url: https://github.com/libLAS/libLAS/archive/{{ version }}.tar.gz sha256: 31cff4fd235f9397df8c3086b0aefc50a047d2be0e9ce39f0cddfc662633fa93 build: @@ -29,7 +29,6 @@ requirements: - proj4 run: - python - - setuptools - boost - boost-cpp - geotiff From 50a51eb299e774944b716fd85ad48c78ff6bca8e Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 07:48:36 -0700 Subject: [PATCH 51/67] Clean up build and deps --- recipes/pymccrgb/meta.yaml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 6661a60e6b2f0..55d006216071a 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -10,42 +10,26 @@ source: sha256: 17119579f934016e4561b032186d7c834a2ae9e61e26accbb94313cc92b3f39e build: - noarch: python number: 0 requirements: - build: - - {{ compiler('c') }} - - {{ compiler('cxx') }} - - cmake - - liblas - - pymcc_lidar host: - - boost - - cmake - - cython + - pip + - python - fiona - - liblas - matplotlib - numpy - pdal - - pip - - python - pymcc_lidar - scikit-image - scikit-learn - scipy run: - - boost - - cmake - - cython + - python - fiona - - liblas - matplotlib - numpy - pdal - - pip - - python - pymcc_lidar - scikit-image - scikit-learn From f0885888b2fba494064d0be1bf1c6c3edd25563f Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 08:57:12 -0700 Subject: [PATCH 52/67] Limit to linux, clean up host deps --- recipes/pymcc_lidar/meta.yaml | 4 +++- recipes/pymccrgb/meta.yaml | 11 ++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index 2ab8264ddd9c7..5cd399bb2f773 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -11,6 +11,7 @@ source: build: number: 0 + skip: True # [not linux] requirements: build: @@ -20,8 +21,9 @@ requirements: - cython - liblas host: - - pip - python + - pip + - cython - liblas - numpy >=1.14.6 run: diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 55d006216071a..3ee2eefff3f12 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -11,19 +11,12 @@ source: build: number: 0 + skip: True # [not linux] requirements: host: - - pip - python - - fiona - - matplotlib - - numpy - - pdal - - pymcc_lidar - - scikit-image - - scikit-learn - - scipy + - pip run: - python - fiona From 2327da519b884b3cee766cdc7e2fee266e93ea16 Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 11:37:02 -0700 Subject: [PATCH 53/67] Add pdal python package --- recipes/pymccrgb/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 3ee2eefff3f12..e3a40ef6ef5d4 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -23,6 +23,7 @@ requirements: - matplotlib - numpy - pdal + - python-pdal - pymcc_lidar - scikit-image - scikit-learn From fa6c3eaf8777c3576ba417cabbbe431a9cf7b3bd Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 15:15:15 -0700 Subject: [PATCH 54/67] LibLAS: Skip win build, add hobu as maintainer --- recipes/liblas/meta.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 2a3af961cd510..39a3206fb058e 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -10,6 +10,7 @@ source: sha256: 31cff4fd235f9397df8c3086b0aefc50a047d2be0e9ce39f0cddfc662633fa93 build: + skip: True # [win] number: 0 requirements: @@ -19,8 +20,8 @@ requirements: - cmake - make host: - - pip - python + - pip - setuptools - boost - boost-cpp @@ -50,4 +51,5 @@ about: extra: recipe-maintainers: + - hobu - rmsare From c868763918f0910b1314a15bee07ed7d0e495561 Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 15:15:48 -0700 Subject: [PATCH 55/67] Remove fiona dep to try to fix conflict --- recipes/pymccrgb/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index e3a40ef6ef5d4..6520c9bd10722 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -19,7 +19,6 @@ requirements: - pip run: - python - - fiona - matplotlib - numpy - pdal From 08f35838b0304cd7cfd055935580a00d4c546e9b Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 18:39:43 -0700 Subject: [PATCH 56/67] Pin gdal 2 to try to fix fiona conflict --- recipes/pymccrgb/meta.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 6520c9bd10722..320f1237f71c6 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -19,6 +19,8 @@ requirements: - pip run: - python + - fiona + - gdal <=2.4.1 - matplotlib - numpy - pdal From 618ffa13638b14fd94ed128ca38ae82a16f156b7 Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 18:51:00 -0700 Subject: [PATCH 57/67] Use pin_compat template instead --- recipes/pymccrgb/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 320f1237f71c6..5a15f11a00b87 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -20,7 +20,7 @@ requirements: run: - python - fiona - - gdal <=2.4.1 + - {{ pin_compatible('gdal', upper_bound='3.0') }} # Fiona supports GDAL 2 - matplotlib - numpy - pdal From 241a6b0cc9028882dde61e203e69dba6867933b2 Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 18:55:34 -0700 Subject: [PATCH 58/67] Update LibLAS info and remove unused deps (i think) --- recipes/liblas/meta.yaml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index 39a3206fb058e..e54c50c03c167 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -45,9 +45,16 @@ about: license: BSD license_family: BSD license_file: LICENSE.txt - summary: LAS 1.0/1.1/1.2 LiDAR data format translation - doc_url: https://liblas.org - dev_url: https://github.com/liblas/libas + summary: Library for reading and writing the very common LAS LiDAR format. + description: | + libLAS is a C/C++ library for reading and writing the very common LAS LiDAR + format (LAS 1.0/1.1/1.2 ASPRS). The ASPRS LAS format is a sequential binary + format used to store data from LiDAR sensors and by LiDAR processing + software for data interchange and archival. As of 2018, libLAS has been + replaced by the PDAL project and it is in hibernation or maintenance mode. + libLAS does not provide support for LAS or LAZ 1.4, which PDAL does. + dev_url: https://github.com/libLAS/libLAS + doc_url: https://liblas.org/docs.html extra: recipe-maintainers: From 55509b47125ae12a481fe687d663b2b8ffbb606b Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 18:56:08 -0700 Subject: [PATCH 59/67] Update LibLAS info and remove unused deps (i think) --- recipes/liblas/meta.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/liblas/meta.yaml b/recipes/liblas/meta.yaml index e54c50c03c167..26d78161660eb 100644 --- a/recipes/liblas/meta.yaml +++ b/recipes/liblas/meta.yaml @@ -23,17 +23,15 @@ requirements: - python - pip - setuptools - - boost - boost-cpp - geotiff - - gdal + - libgdal - proj4 run: - python - - boost - boost-cpp - geotiff - - gdal + - libgdal - proj4 test: From e89b2b3b5e68d08b95d8c68a9787e61c510179a1 Mon Sep 17 00:00:00 2001 From: rmsare Date: Fri, 25 Oct 2019 22:05:58 -0700 Subject: [PATCH 60/67] Bump version after removing fiona dep --- recipes/pymccrgb/meta.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 5a15f11a00b87..0f29c91ac3149 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pymccrgb" %} -{% set version = "0.1.5" %} +{% set version = "0.1.6" %} package: name: "{{ name|lower }}" @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 17119579f934016e4561b032186d7c834a2ae9e61e26accbb94313cc92b3f39e + sha256: 4fec43877ba16587a3c0a5daf01e782d97421bffa3006b7b602cb8c33aa32af0 build: number: 0 @@ -19,8 +19,6 @@ requirements: - pip run: - python - - fiona - - {{ pin_compatible('gdal', upper_bound='3.0') }} # Fiona supports GDAL 2 - matplotlib - numpy - pdal From 6cc7b1e2e8b880c8e9f7257e514d55cfbab6c4c9 Mon Sep 17 00:00:00 2001 From: rmsare Date: Sat, 26 Oct 2019 08:06:41 -0700 Subject: [PATCH 61/67] Try to pin numpy in pymccrgb --- recipes/pymccrgb/meta.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 0f29c91ac3149..2eb2a0da05090 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -17,10 +17,18 @@ requirements: host: - python - pip + - matplotlib + - numpy >=1.14.6 + - pdal + - python-pdal + - pymcc_lidar + - scikit-image + - scikit-learn + - scipy run: - python - matplotlib - - numpy + - numpy >=1.14.6 - pdal - python-pdal - pymcc_lidar From fd86c612b54e2777546b3c9fa278663541bbf152 Mon Sep 17 00:00:00 2001 From: rmsare Date: Sat, 26 Oct 2019 11:17:22 -0700 Subject: [PATCH 62/67] Bump pymccrgb version --- recipes/pymccrgb/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index 2eb2a0da05090..aea26193c3003 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pymccrgb" %} -{% set version = "0.1.6" %} +{% set version = "0.1.7" %} package: name: "{{ name|lower }}" @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 4fec43877ba16587a3c0a5daf01e782d97421bffa3006b7b602cb8c33aa32af0 + sha256: 378f2207f8f8ccfb1ff3a93c702f34f6254e62ebdfa287b86bf4ead471a0a653 build: number: 0 From 35abee6f4be3600ca52b3b8a1433c43dbe7b7589 Mon Sep 17 00:00:00 2001 From: Robert Sare Date: Sat, 26 Oct 2019 11:40:13 -0700 Subject: [PATCH 63/67] conda python -> $PYTHON Co-Authored-By: Isuru Fernando --- recipes/pymcc_lidar/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/pymcc_lidar/build.sh b/recipes/pymcc_lidar/build.sh index 8bde9aff4887e..d95db39d71a87 100644 --- a/recipes/pymcc_lidar/build.sh +++ b/recipes/pymcc_lidar/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -export PYTHON_EXECUTABLE=$CONDA_PYTHON_EXE +export PYTHON_EXECUTABLE=$PYTHON $PYTHON setup.py --quiet install --single-version-externally-managed --record=record.txt From 02b080be319814daff8c1eabd4beb9d1bee17c6f Mon Sep 17 00:00:00 2001 From: rmsare Date: Sat, 26 Oct 2019 14:06:44 -0700 Subject: [PATCH 64/67] Try to pin numpy to fix deps --- recipes/pymcc_lidar/meta.yaml | 4 ++-- recipes/pymccrgb/meta.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index 5cd399bb2f773..e206278e17a5c 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -25,11 +25,11 @@ requirements: - pip - cython - liblas - - numpy >=1.14.6 + - {{ pin_compatible('numpy') }} run: - python - liblas - - numpy >=1.14.6 + - {{ pin_compatible('numpy') }} test: imports: diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index aea26193c3003..fa2bd42adfab0 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -18,7 +18,7 @@ requirements: - python - pip - matplotlib - - numpy >=1.14.6 + - {{ pin_compatible('numpy') }} - pdal - python-pdal - pymcc_lidar @@ -28,7 +28,7 @@ requirements: run: - python - matplotlib - - numpy >=1.14.6 + - {{ pin_compatible('numpy') }} - pdal - python-pdal - pymcc_lidar From b8484b63c761c6f7f2330d8a0286f45b8ef7b97a Mon Sep 17 00:00:00 2001 From: rmsare Date: Sat, 26 Oct 2019 16:34:30 -0700 Subject: [PATCH 65/67] Dont pin numpy --- recipes/pymcc_lidar/meta.yaml | 4 ++-- recipes/pymccrgb/meta.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes/pymcc_lidar/meta.yaml b/recipes/pymcc_lidar/meta.yaml index e206278e17a5c..12d26a6515d04 100644 --- a/recipes/pymcc_lidar/meta.yaml +++ b/recipes/pymcc_lidar/meta.yaml @@ -25,11 +25,11 @@ requirements: - pip - cython - liblas - - {{ pin_compatible('numpy') }} + - numpy run: - python - liblas - - {{ pin_compatible('numpy') }} + - numpy test: imports: diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index fa2bd42adfab0..ad9865bf540a3 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -18,7 +18,7 @@ requirements: - python - pip - matplotlib - - {{ pin_compatible('numpy') }} + - numpy - pdal - python-pdal - pymcc_lidar @@ -28,7 +28,7 @@ requirements: run: - python - matplotlib - - {{ pin_compatible('numpy') }} + - numpy - pdal - python-pdal - pymcc_lidar From e3fa9ede1fbbef8a3f4c75870e0b220a8a4b4c03 Mon Sep 17 00:00:00 2001 From: rmsare Date: Sat, 26 Oct 2019 16:37:29 -0700 Subject: [PATCH 66/67] Remove pdal binaries dep, not used --- recipes/pymccrgb/meta.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml index ad9865bf540a3..045622a3ef597 100644 --- a/recipes/pymccrgb/meta.yaml +++ b/recipes/pymccrgb/meta.yaml @@ -19,7 +19,6 @@ requirements: - pip - matplotlib - numpy - - pdal - python-pdal - pymcc_lidar - scikit-image @@ -29,7 +28,6 @@ requirements: - python - matplotlib - numpy - - pdal - python-pdal - pymcc_lidar - scikit-image From 1104d93c1a7bbe368ef0684b61316001bcefa3dc Mon Sep 17 00:00:00 2001 From: rmsare Date: Thu, 14 Nov 2019 15:49:31 -0800 Subject: [PATCH 67/67] Remove recipe for separate PR --- recipes/pymccrgb/build.sh | 3 --- recipes/pymccrgb/meta.yaml | 52 -------------------------------------- 2 files changed, 55 deletions(-) delete mode 100644 recipes/pymccrgb/build.sh delete mode 100644 recipes/pymccrgb/meta.yaml diff --git a/recipes/pymccrgb/build.sh b/recipes/pymccrgb/build.sh deleted file mode 100644 index e483bb2d39c7d..0000000000000 --- a/recipes/pymccrgb/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -$PYTHON setup.py --quiet install --single-version-externally-managed --record=record.txt diff --git a/recipes/pymccrgb/meta.yaml b/recipes/pymccrgb/meta.yaml deleted file mode 100644 index 045622a3ef597..0000000000000 --- a/recipes/pymccrgb/meta.yaml +++ /dev/null @@ -1,52 +0,0 @@ -{% set name = "pymccrgb" %} -{% set version = "0.1.7" %} - -package: - name: "{{ name|lower }}" - version: "{{ version }}" - -source: - url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: 378f2207f8f8ccfb1ff3a93c702f34f6254e62ebdfa287b86bf4ead471a0a653 - -build: - number: 0 - skip: True # [not linux] - -requirements: - host: - - python - - pip - - matplotlib - - numpy - - python-pdal - - pymcc_lidar - - scikit-image - - scikit-learn - - scipy - run: - - python - - matplotlib - - numpy - - python-pdal - - pymcc_lidar - - scikit-image - - scikit-learn - - scipy - -test: - imports: - - pymccrgb - -about: - home: https://github.com/rmsare/pymccrgb - license: MIT - license_family: MIT - license_file: LICENSE - summary: A Python package for point cloud classification using color and curvature - doc_url: https://pymccrgb.readthedocs.io - dev_url: https://github.com/rmsare/pymccrgb - -extra: - recipe-maintainers: - - rmsare