Merge pull request #36 from regro-cf-autotick-bot/1.12.4_hb5fcae

pyre v1.12.4
conda-forge · Jan 5, 2024 · 083d98e · 083d98e
2 parents 4e6a71a + cf6ba33
commit 083d98e
Show file tree

Hide file tree

Showing 31 changed files with 82 additions and 78 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.22'
 pin_run_as_build:

diff --git a/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.22'
 pin_run_as_build:

diff --git a/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.22'
 pin_run_as_build:

diff --git a/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.23'
 pin_run_as_build:

diff --git a/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.26'
 pin_run_as_build:

diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.10.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.22'
 pin_run_as_build:

diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.8.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.22'
 pin_run_as_build:

diff --git a/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.22python3.9.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.22'
 pin_run_as_build:

diff --git a/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.23python3.11.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.23'
 pin_run_as_build:

diff --git a/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/linux_ppc64le_numpy1.26python3.12.____cpythonpython_implcpython.yaml
@@ -15,7 +15,7 @@ cxx_compiler_version:
 docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 hdf5:
-- 1.14.2
+- 1.14.3
 numpy:
 - '1.26'
 pin_run_as_build:

diff --git a/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.10.____cpythonpython_implcpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:

diff --git a/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.8.____cpythonpython_implcpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:

diff --git a/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.22python3.9.____cpythonpython_implcpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:

diff --git a/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.23python3.11.____cpythonpython_implcpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:

diff --git a/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml b/.ci_support/osx_64_numpy1.26python3.12.____cpythonpython_implcpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - x86_64-apple-darwin13.4.0
 numpy:

diff --git a/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.10.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 numpy:

diff --git a/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.8.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 numpy:

diff --git a/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml b/.ci_support/osx_arm64_numpy1.22python3.9.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 numpy:

diff --git a/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml b/.ci_support/osx_arm64_numpy1.23python3.11.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 numpy:

diff --git a/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml b/.ci_support/osx_arm64_numpy1.26python3.12.____cpython.yaml
@@ -13,7 +13,7 @@ cxx_compiler:
 cxx_compiler_version:
 - '16'
 hdf5:
-- 1.14.2
+- 1.14.3
 macos_machine:
 - arm64-apple-darwin20.0.0
 numpy:

diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/README.md b/README.md
diff --git a/recipe/macos-clock.patch b/recipe/macos-clock.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,21 +1,19 @@
 {% set name = "pyre" %}
-{% set version = "1.12.3" %}
+{% set version = "1.12.4" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   - url: https://github.com/pyre/pyre/archive/v{{ version }}.tar.gz
-    sha256: 18cfa8461fd273f815e433cfe80eeb69174a1b8b62fc0b81dd0b403d74272d1a
+    sha256: b012445bcd085f9ed1a3ce51306e597ac4c575ea2f43c509ce4c9371da201571
     patches:
-        # Fallback clock stub for pre-10.12 SDK
-      - macos-clock.patch
-        # Use builtin Python_SOABI cmake var instead of distutils
-      - python-soabi.patch
+        # missing ';' in a statement
+        process-timer.patch
 
 build:
-  number: 2
+  number: 0
   skip: true  # [win or py2k or python_impl == 'pypy']
 
 requirements:

diff --git a/recipe/process-timer.patch b/recipe/process-timer.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/pyre/timers/ProcessClock.icc b/lib/pyre/timers/ProcessClock.icc
+index 1c80fcef8..b654c4dc2 100644
+--- a/lib/pyre/timers/ProcessClock.icc
++++ b/lib/pyre/timers/ProcessClock.icc
+@@ -26,7 +26,7 @@ pyre::timers::ProcessClock::now() -> time_point_type
+ // otherwise
+ #else
+     // complain
+-    throw std::runtime_error("this platform doesn't have support for CLOCK_PROCESS_CPUTIME_ID")
++    throw std::runtime_error("this platform doesn't have support for CLOCK_PROCESS_CPUTIME_ID");
+ #endif
+ }
+
diff --git a/recipe/python-soabi.patch b/recipe/python-soabi.patch