[bot-automerge] pytest-bdd v7.1.1 (#18)

automerged PR by conda-forge/automerge-action
This commit is contained in:
github-actions[bot] 2024-03-05 04:25:24 +00:00 committed by GitHub
commit e2f0181973
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 37 additions and 15 deletions

25
.gitignore generated vendored
View File

@ -1,3 +1,24 @@
*.pyc
# User content belongs under recipe/.
# Feedstock configuration goes in `conda-forge.yml`
# Everything else is managed by the conda-smithy rerender process.
# Please do not modify
build_artifacts
# Ignore all files and folders in root
*
!/conda-forge.yml
# Don't ignore any files/folders if the parent folder is 'un-ignored'
# This also avoids warnings when adding an already-checked file with an ignored parent.
!/**/
# Don't ignore any files/folders recursively in the following folders
!/recipe/**
!/.ci_support/**
# Since we ignore files/folders recursively, any folders inside
# build_artifacts gets ignored which trips some build systems.
# To avoid that we 'un-ignore' all files/folders recursively
# and only ignore the root build_artifacts folder.
!/build_artifacts/**
/build_artifacts
*.pyc

View File

@ -34,9 +34,9 @@ CONDARC
export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
pip mamba conda-build boa conda-forge-ci-setup=4
pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
pip mamba conda-build boa conda-forge-ci-setup=4
pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
@ -54,12 +54,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then
cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt"
fi
if [[ "${sha:-}" == "" ]]; then
pushd ${FEEDSTOCK_ROOT}
sha=$(git rev-parse HEAD)
popd
fi
if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then
EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}"
@ -71,7 +65,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
# Drop into an interactive shell
/bin/bash
else
conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
--suppress-variables ${EXTRA_CB_OPTIONS:-} \
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \
--extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"

View File

@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then
export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT})
fi
if [[ "${sha:-}" == "" ]]; then
pushd "${FEEDSTOCK_ROOT}"
sha=$(git rev-parse HEAD)
popd
fi
docker info
# In order for the conda-build process in the container to write to the mounted

5
build-locally.py generated
View File

@ -64,8 +64,9 @@ def verify_config(ns):
elif ns.config.startswith("osx"):
if "OSX_SDK_DIR" not in os.environ:
raise RuntimeError(
"Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' "
"to download the SDK automatically to 'SDKs/MacOSX<ver>.sdk'. "
"Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' "
"to download the SDK automatically to '$PWD/SDKs/MacOSX<ver>.sdk'. "
"Note: OSX_SDK_DIR must be set to an absolute path. "
"Setting this variable implies agreement to the licensing terms of the SDK by Apple."
)

View File

@ -1,5 +1,5 @@
{% set name = "pytest-bdd" %}
{% set version = "7.0.1" %}
{% set version = "7.1.1" %}
package:
name: {{ name|lower }}
@ -7,7 +7,7 @@ package:
source:
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name.replace('-', '_') }}-{{ version }}.tar.gz
sha256: 652d9c5324076ed9348f1c69b6512c00c581708ff17f063771ea703b62d3b956
sha256: 1b41a10a8391f1849f0a1524d77b2991d0d8042d2253ace9b616b89b4a9b97a7
build:
noarch: python