From 38fc1a664e2e3987da310f0b9bfe8a601bc3eec4 Mon Sep 17 00:00:00 2001 From: Michael Weinold <23102087+michaelweinold@users.noreply.github.com> Date: Sat, 19 Aug 2023 10:39:19 +0200 Subject: [PATCH 1/6] initial commit --- README.md | 2 ++ recipe/meta.yaml | 1 + 2 files changed, 3 insertions(+) diff --git a/README.md b/README.md index 46e51eb..8c23fbd 100644 --- a/README.md +++ b/README.md @@ -145,5 +145,7 @@ In order to produce a uniquely identifiable distribution: Feedstock Maintainers ===================== +* [@cmutel](https://github.com/cmutel/) * [@m-rossi](https://github.com/m-rossi/) +* [@michaelweinold](https://github.com/michaelweinold/) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 605a5f7..57d1329 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -53,3 +53,4 @@ extra: recipe-maintainers: - cmutel - m-rossi + - michaelweinold From 43db2323f0b312e2e7bc6d5b86a4e45fae655427 Mon Sep 17 00:00:00 2001 From: Michael Weinold <23102087+michaelweinold@users.noreply.github.com> Date: Sat, 19 Aug 2023 17:52:55 +0200 Subject: [PATCH 2/6] updated recipes --- recipe/conda_build_config.yaml | 4 ++++ recipe/meta.yaml | 12 +++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 recipe/conda_build_config.yaml diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml new file mode 100644 index 0000000..8f20053 --- /dev/null +++ b/recipe/conda_build_config.yaml @@ -0,0 +1,4 @@ +channel_targets: + - conda-forge bw2io_dev +channel_sources: + - conda-forge/label/bw2data_dev,conda-forge,defaults \ No newline at end of file diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 57d1329..55a7e15 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "bw2io" %} -{% set version = "0.8.8" %} +{% set version = "0.9.dev21" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz - sha256: d4edfc56c76c236717e748562de143912ada22aae64496d900f464b837fc7a1e + sha256: cadef8fbc64950291b1d227b55c9c0b3fe6b6e4805f48cb5a176aac073ac7c5e build: noarch: python @@ -20,15 +20,17 @@ requirements: - python >=3.6 - setuptools run: - - bw_migrations - bw2calc >=1.7.4 - bw2data >=3.5.1 + - bw2parameters >= 0.7.1, + - bw_migrations + - bw_processing - lxml - mrio_common_metadata - numpy - openpyxl - - psutil - - pyprind + - platformdirs + - requests - python >=3.6 - scipy - stats_arrays From e289a8481ae1a47ace9d365e8c9d1461e8800269 Mon Sep 17 00:00:00 2001 From: Michael Weinold <23102087+michaelweinold@users.noreply.github.com> Date: Sat, 19 Aug 2023 17:55:08 +0200 Subject: [PATCH 3/6] MNT: Re-rendered with conda-build 3.26.0, conda-smithy 3.24.1, and conda-forge-pinning 2023.08.19.12.38.33 --- .azure-pipelines/azure-pipelines-linux.yml | 5 ----- .ci_support/linux_64_.yaml | 4 ++-- .github/CODEOWNERS | 2 +- .scripts/build_steps.sh | 4 ++-- README.md | 8 ++++---- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 974e878..a20f315 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -15,11 +15,6 @@ jobs: timeoutInMinutes: 360 steps: - - script: | - rm -rf /opt/ghc - df -h - displayName: Manage disk space - # configure qemu binfmt-misc running. This allows us to run docker containers # embedded qemu-static - script: | diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 6c59082..deae98c 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -1,8 +1,8 @@ cdt_name: - cos6 channel_sources: -- conda-forge +- conda-forge/label/bw2data_dev,conda-forge,defaults channel_targets: -- conda-forge main +- conda-forge bw2io_dev docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 17776de..2aeec09 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @cmutel @m-rossi \ No newline at end of file +* @cmutel @m-rossi @michaelweinold \ No newline at end of file diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 71a4242..595f8b5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,9 +33,9 @@ CONDARC mamba install --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 mamba update --update-specs --yes --quiet --channel conda-forge \ - conda-build pip boa conda-forge-ci-setup=3 "py-lief<0.12" + conda-build pip boa conda-forge-ci-setup=3 # set up the condarc setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" diff --git a/README.md b/README.md index 8c23fbd..4c20126 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ -About bw2io -=========== +About bw2io-feedstock +===================== + +Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/bw2io-feedstock/blob/main/LICENSE.txt) Home: https://github.com/brightway-lca/brightway2-io Package license: BSD-3-Clause -Feedstock license: [BSD-3-Clause](https://github.com/conda-forge/bw2io-feedstock/blob/main/LICENSE.txt) - Summary: Tools for importing and export life cycle inventory databases Development: https://github.com/brightway-lca/brightway2-io From 44c1c581d2032c985e0538b928e21bba9e6018cc Mon Sep 17 00:00:00 2001 From: Michael Weinold <23102087+michaelweinold@users.noreply.github.com> Date: Sat, 19 Aug 2023 17:55:30 +0200 Subject: [PATCH 4/6] removed comma and ran smithy --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 55a7e15..d72d4d6 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,7 @@ requirements: run: - bw2calc >=1.7.4 - bw2data >=3.5.1 - - bw2parameters >= 0.7.1, + - bw2parameters >=0.7.1 - bw_migrations - bw_processing - lxml From 11c353817d36808c3da47e2cd4fb719c925b1608 Mon Sep 17 00:00:00 2001 From: Michael Weinold <23102087+michaelweinold@users.noreply.github.com> Date: Sat, 19 Aug 2023 17:59:13 +0200 Subject: [PATCH 5/6] removed duplicate --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bf0506d..b89db91 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -56,4 +56,3 @@ extra: - michaelweinold - cmutel - m-rossi - - michaelweinold From b2a76c5a42c4bcb0eca3dcb21c36a4ae2cb5ad88 Mon Sep 17 00:00:00 2001 From: Michael Weinold <23102087+michaelweinold@users.noreply.github.com> Date: Sat, 19 Aug 2023 18:12:20 +0200 Subject: [PATCH 6/6] removed channel_sources --- recipe/conda_build_config.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 8f20053..01dc834 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -1,4 +1,2 @@ channel_targets: - conda-forge bw2io_dev -channel_sources: - - conda-forge/label/bw2data_dev,conda-forge,defaults \ No newline at end of file