From 0a4f8d3cb089c6b42a30a0b74744d40b53dc64ae Mon Sep 17 00:00:00 2001 From: "Patrou, Maria" Date: Tue, 18 Feb 2025 16:22:27 -0500 Subject: [PATCH] mcvine removed, compler options added in meta --- .github/workflows/actions.yml | 3 +-- README.md | 2 +- conda.recipe/meta.yaml | 4 ++-- environment.yml | 1 - 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index 568d228..2dc4924 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -50,7 +50,6 @@ jobs: cache-downloads-key: ${{ runner.os }}-downloads-${{ hashFiles('**/environment.yml') }} condarc: | channels: - - mcvine - conda-forge - name: build python wheel shell: bash -l {0} @@ -63,7 +62,7 @@ jobs: cd conda.recipe echo "versioningit $(versioningit ../)" # build the package - CHANNELS="--channel mcvine --channel conda-forge" + CHANNELS="--channel conda-forge" VERSION=$(versioningit ../) conda mambabuild $CHANNELS --output-folder . . conda verify noarch/histogram*.tar.bz2 - name: upload conda package to anaconda diff --git a/README.md b/README.md index 027488a..87f93ff 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ histogram data object # create a conda package $ cd conda.recipe $ echo "versioningit $(versioningit ../)" - $ CHANNELS="--channel mcvine --channel conda-forge" + $ CHANNELS="--channel conda-forge" $ VERSION=$(versioningit ../) conda mambabuild $CHANNELS --output-folder . . $ conda verify noarch/histogram-*.tar.bz2 # install a local conda package diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 8853567..2ef8bd9 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -21,8 +21,8 @@ source: build: script_env: - - CC - - CXX + - {{ compiler("c") }} + - {{ compiler("cxx") }} noarch: python number: {{ build_number }} diff --git a/environment.yml b/environment.yml index 095c437..4fd3527 100644 --- a/environment.yml +++ b/environment.yml @@ -1,6 +1,5 @@ name: histogram-dev channels: - - mcvine - conda-forge dependencies: - anaconda-client