Merge branch 'master' into bioconductor-improvements

bioconda · Jan 15, 2024 · e36acf6 · e36acf6
2 parents b720899 + 8255afd
commit e36acf6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+### [2.11.1](https://www.github.com/bioconda/bioconda-utils/compare/v2.11.0...v2.11.1) (2023-12-13)
+
+
+### Bug Fixes
+
+* add local channel for docker builds ([#945](https://www.github.com/bioconda/bioconda-utils/issues/945)) ([de8ce00](https://www.github.com/bioconda/bioconda-utils/commit/de8ce00d1ccf6a395ff6adce97f71b5c6059500f))
+* Fix version number check in repodata_patches_no_version_bump() ([#946](https://www.github.com/bioconda/bioconda-utils/issues/946)) ([73e69b2](https://www.github.com/bioconda/bioconda-utils/commit/73e69b2f9aabb06f693518b8ee195c7fa897bc76))
+
+## [2.11.0](https://www.github.com/bioconda/bioconda-utils/compare/v2.10.0...v2.11.0) (2023-11-30)
+
+
+### Features
+
+* make GITHUB_TOKEN optional for fetch ([#942](https://www.github.com/bioconda/bioconda-utils/issues/942)) ([c0eab1d](https://www.github.com/bioconda/bioconda-utils/commit/c0eab1d7224d6b13ebe399e7933460249e4e9a58))
+
 ## [2.10.0](https://www.github.com/bioconda/bioconda-utils/compare/v2.9.0...v2.10.0) (2023-11-26)
 
 

diff --git a/bioconda_utils/docker_utils.py b/bioconda_utils/docker_utils.py
@@ -105,7 +105,7 @@
 # The actual building...
 # we explicitly point to the meta.yaml, in order to keep
 # conda-build from building all subdirectories
-conda mambabuild {self.conda_build_args} {self.container_recipe}/meta.yaml 2>&1
+conda mambabuild -c file://{self.container_staging} {self.conda_build_args} {self.container_recipe}/meta.yaml 2>&1
 
 # copy all built packages to the staging area
 cp /opt/conda/conda-bld/*/*.tar.bz2 {self.container_staging}/{arch}

diff --git a/bioconda_utils/lint/check_build_help.py b/bioconda_utils/lint/check_build_help.py
@@ -134,7 +134,7 @@ class cython_needs_compiler(LintCheck):
     """
     severity = WARNING
     def check_deps(self, deps):
-        if 'cython' in deps and 'compiler_c' not in deps:
+        if 'cython' in deps and 'compiler_c' not in deps and 'compiler_cxx' not in deps:
             self.message()
 
 

diff --git a/bioconda_utils/lint/check_repodata_patches.py b/bioconda_utils/lint/check_repodata_patches.py
@@ -12,7 +12,7 @@ def check_recipe(self, recipe):
             return
         repodata = utils.RepoData()
         old_versions = repodata.get_versions("bioconda-repodata-patches")
-        if recipe.get('version') in old_versions:
+        if recipe.get('package/version') in old_versions:
             self.message()
 
 

diff --git a/test/lint_cases.yaml b/test/lint_cases.yaml
@@ -403,6 +403,10 @@ tests:
     add:
       requirements: { host: [cython], build: ['{{compiler("c")}}'] }
       build: { noarch: False }
+  - name: cython_cxx_compiler_ok
+    add:
+      requirements: { host: [cython], build: ['{{compiler("cxx")}}'] }
+      build: { noarch: False }
   - name: missing_run_exports
     remove: build/run_exports
     expect: missing_run_exports