diff --git a/.gitignore b/.gitignore index 62bf059..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,9 @@ * !/conda-forge.yml -# Don't ignore any subfolders if the parent folder is 'un-ignored' -!/*/ +# 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/** diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 57c8085..408b7ff 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "3.30.4" %} +{% set version = "3.31.0" %} package: name: conda-smithy @@ -6,7 +6,7 @@ package: source: url: https://github.com/conda-forge/conda-smithy/releases/download/v{{ version }}/conda-smithy-{{ version }}.tar.gz - sha256: 4a0373e84316cf4bb711779a258a200f778daf3e6cfc51cae8a5df383e3383dd + sha256: fb01cbecadffd3a7d8b7c9a9d65e76a87579fa0a9957906306032ff93ce902ee build: number: 0 @@ -30,7 +30,7 @@ requirements: - python >=3.6 - setuptools - conda >=4.2 - - conda-build >=3.18.3 + - conda-build >=24.1.0 - conda-package-handling >=1.9.0 - jinja2 - requests