From a0b4e49d2085dced2d0291141ed97f56db95630b Mon Sep 17 00:00:00 2001 From: DubathF Date: Mon, 26 Aug 2024 15:12:09 +0200 Subject: [PATCH] Align on Alexandria feedstock --- .gitignore | 1 + .scripts/git-askpass.sh | 3 --- .scripts/run_docker_build.sh | 5 ++-- conda-forge.yml | 2 -- recipe/meta.yaml~ | 51 ------------------------------------ 5 files changed, 3 insertions(+), 59 deletions(-) delete mode 100755 .scripts/git-askpass.sh delete mode 100644 recipe/meta.yaml~ diff --git a/.gitignore b/.gitignore index 179afe5..22d2c27 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ !/build_artifacts/** /build_artifacts +*~ *.pyc diff --git a/.scripts/git-askpass.sh b/.scripts/git-askpass.sh deleted file mode 100755 index 4bff061..0000000 --- a/.scripts/git-askpass.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -exec echo "$GIT_TOKEN" - diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index e5d4fdd..5e69be9 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -101,8 +101,6 @@ docker run ${DOCKER_RUN_ARGS} \ -e remote_url \ -e sha \ -e BINSTAR_TOKEN \ - -e GIT_TOKEN \ - -e GIT_USER \ "${DOCKER_IMAGE}" \ bash \ "/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh" @@ -111,4 +109,5 @@ docker run ${DOCKER_RUN_ARGS} \ test -f "$DONE_CANARY" # This closes the last group opened in `build_steps.sh` -( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file +( endgroup "Final checks" ) 2> /dev/null + diff --git a/conda-forge.yml b/conda-forge.yml index b685f9a..5341cf2 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -15,8 +15,6 @@ provider: azure: store_build_artifacts: False -secrets: ["GIT_USER", "GIT_TOKEN"] - recipe_dir: recipe skip_render: diff --git a/recipe/meta.yaml~ b/recipe/meta.yaml~ deleted file mode 100644 index fb17c1b..0000000 --- a/recipe/meta.yaml~ +++ /dev/null @@ -1,51 +0,0 @@ -{% set name = "PHZ_NNPZ" %} -{% set version = "1.3.0" %} -{% set tagversion = "1.3.0" %} -{% set build_number = 0 %} - -package: - name: {{ name|lower }} - version: {{ version }} - -source: - git_rev: {{ tagversion }} - git_url: https://github.com/astrorama/PHZ_NNPZ.git - -build: - number: {{ build_number }} - run_exports: - - {{ pin_subpackage('alexandria', max_pin='x.x.x') }} - -requirements: - build: - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - cmake >=3.0 - - make - - {{ compiler('cxx') }} - - {{ compiler('c') }} - - libcxx<16 - host: - - python - - boost - - libcxx<16 - - alexandria ==2.30.3 - - cfitsio <4.3 - - CCfits >=2.5 - run: - - {{ pin_compatible('python', min_pin='x.x', max_pin='x.x') }} - - {{ pin_compatible('boost', min_pin='x.x', max_pin='x.x') }} - - {{ pin_compatible('libcxx', min_pin='x.x', max_pin='x.x') }} - - {{ pin_compatible('cfitsio', min_pin='x.x', max_pin='x.x') }} - - {{ pin_compatible('CCfits', min_pin='x.x', max_pin='x.x') }} - -test: - commands: - - $PREFIX/bin/nnpz --version - -about: - home: https://github.com/astrorama/PHZ_NNPZ.git - license: LGPL - license_file: LICENSE - summary: SDC-CH Nearest Neighbor Photometric Redshift Tool -