Merge pull request #21 from regro-cf-autotick-bot/0.51.0_hdb3034

flux-core v0.51.0
conda-forge · Jun 10, 2023 · 37a8165 · 37a8165
2 parents b0fb093 + 54f5f7a
commit 37a8165
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,19 +1,19 @@
 {% set name = "flux-core" %}
-{% set version = "0.50.0" %}
+{% set version = "0.51.0" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   url: https://github.com/flux-framework/flux-core/releases/download/v{{ version }}/flux-core-{{ version }}.tar.gz
-  sha256: 77414299a7ca081199aa0f57bcaea3e05860e2095df73c0f6b7672b88fadf683
+  sha256: e57b71b708482f20d2a2195a000c0c3b9176faa6aaadfad4d2117f8671ca67ce
   patches:
     - centos6.patch  # This patch can be removed once the conda-forge reference is updated
-    - python311.patch  # This patch can be removed once https://github.com/flux-framework/flux-core/pull/5157 is merged
+    - signal.patch
 
 build:
-  number: 1
+  number: 0
   skip: true  # [not linux]
   run_exports:
     - {{ pin_subpackage('flux-core', max_pin='x.x') }}

diff --git a/recipe/python311.patch b/recipe/python311.patch
diff --git a/recipe/signal.patch b/recipe/signal.patch
@@ -0,0 +1,12 @@
+diff --git a/src/cmd/flux-job.c b/src/cmd/flux-job.c
+index 6fe161801..f4ee5c70e 100644
+--- a/src/cmd/flux-job.c
++++ b/src/cmd/flux-job.c
+@@ -28,6 +28,7 @@
+ #include <jansson.h>
+ #include <argz.h>
+ #include <sys/ioctl.h>
++#include <signal.h>
+ #include <flux/core.h>
+ #include <flux/optparse.h>
+ #include <flux/hostlist.h>