Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix conda_build.config.subdir deprecation #318

Merged
merged 3 commits into from
May 14, 2024
Merged

Fix conda_build.config.subdir deprecation #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c62bbc7
Use `subdir` from `conda`
jakirkham May 14, 2024
5d37808
Bump to `4.4.7`
jakirkham May 14, 2024
0145e49
Add `{{ stdlib('c') }}`
jakirkham May 14, 2024
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
7 changes: 5 additions & 2 deletions recipe/conda_forge_ci_setup/feedstock_outputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@
import sys

from conda_forge_metadata.feedstock_outputs import package_to_feedstock
from conda.base.context import context
import conda_build.config
import requests
import click


conda_subdir = context.subdir

VALIDATION_ENDPOINT = "https://conda-forge.herokuapp.com"
STAGING = "cf-staging"

Expand Down Expand Up @@ -161,8 +164,8 @@ def main(feedstock_name):
for p in os.listdir(os.path.join(conda_build.config.croot, 'noarch')) # noqa
]
+ [
os.path.join(conda_build.config.subdir, p)
for p in os.listdir(os.path.join(conda_build.config.croot, conda_build.config.subdir)) # noqa
os.path.join(conda_subdir, p)
for p in os.listdir(os.path.join(conda_build.config.croot, conda_subdir)) # noqa
])
built_distributions = [
path
Expand Down
3 changes: 2 additions & 1 deletion recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% set name = "conda-forge-ci-setup" %}
{% set version = "4.4.6" %}
{% set version = "4.4.7" %}
{% set build = 0 %}
{% set cuda_compiler_version = cuda_compiler_version or "None" %}
{% if cuda_compiler_version == "None" %}
Expand Down Expand Up @@ -54,6 +54,7 @@ requirements:
# ensure that all variants of cuda_compiler_version are tested
- {{ compiler('cuda') }} # [cuda_compiler_version != "None"]
- {{ compiler('c') }} # [cuda_compiler_version != "None"]
- {{ stdlib('c') }} # [cuda_compiler_version != "None"]
- python # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
host:
Expand Down