Sync libevent-2.1.10 with main (#66)

automerged PR by conda-forge/automerge-action
conda-forge · Sep 26, 2023 · 32dd114 · 32dd114
2 parents cee139d + 62e744a
commit 32dd114
Show file tree

Hide file tree

Showing 14 changed files with 5 additions and 29 deletions.
diff --git a/.ci_support/linux_64_python3.10.____cpython.yaml b/.ci_support/linux_64_python3.10.____cpython.yaml
@@ -20,8 +20,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/linux_64_python3.11.____cpython.yaml b/.ci_support/linux_64_python3.11.____cpython.yaml
@@ -20,8 +20,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/linux_64_python3.8.____cpython.yaml b/.ci_support/linux_64_python3.8.____cpython.yaml
@@ -20,8 +20,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/linux_64_python3.9.____cpython.yaml b/.ci_support/linux_64_python3.9.____cpython.yaml
@@ -20,8 +20,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/osx_64_python3.10.____cpython.yaml b/.ci_support/osx_64_python3.10.____cpython.yaml
@@ -20,8 +20,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/osx_64_python3.11.____cpython.yaml b/.ci_support/osx_64_python3.11.____cpython.yaml
@@ -20,8 +20,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/osx_64_python3.8.____cpython.yaml b/.ci_support/osx_64_python3.8.____cpython.yaml
@@ -20,8 +20,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/osx_64_python3.9.____cpython.yaml b/.ci_support/osx_64_python3.9.____cpython.yaml
@@ -20,8 +20,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/osx_arm64_python3.10.____cpython.yaml b/.ci_support/osx_arm64_python3.10.____cpython.yaml
@@ -18,8 +18,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/osx_arm64_python3.11.____cpython.yaml b/.ci_support/osx_arm64_python3.11.____cpython.yaml
@@ -18,8 +18,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml
@@ -18,8 +18,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml
@@ -18,8 +18,6 @@ gflags:
 - '2.2'
 glog:
 - '0.6'
-libev:
-- '4.33'
 libevent:
 - 2.1.10
 lmdb:

diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml
@@ -6,5 +6,3 @@ libevent:
   - "2.1.10"
 lmdb:
   - "0.9.22"
-msgpack_c:
-  - 6
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -14,7 +14,7 @@ build:
   # is not available for Windows on conda-forge
   # See: https://github.com/conda-forge/folly-feedstock/pull/98
   skip: true  # [win]
-  number: 0
+  number: 1
 
   entry_points:
     - arcticdb_update_storage = arcticdb.scripts.update_storage:main
@@ -41,7 +41,7 @@ requirements:
     - lz4-c
     - prometheus-cpp
     - double-conversion
-    - libevent {{ libevent }}
+    - libevent
     - libprotobuf <4
     - libmongocxx
     - zstd
@@ -66,7 +66,9 @@ requirements:
     - spdlog
     - robin_hood
     - recycle
-    - lmdb ==0.9.22
+    # lmdb's version is constrained in `conda_build_config.yaml` because
+    # specifying it here does not overide the conda-forge's global pinning.
+    - lmdb
     - lmdbxx ==0.9.14
     - fmt <10
     - glog
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,8 +20,6 @@ gflags: @@
     - '2.2'
     glog:
     - '0.6'
-    libev:
-    - '4.33'
     libevent:
     - 2.1.10
     lmdb:
@@ Expand Down @@