Replace khash + tempita with khashl

.circleci/config.yml

@@ -33,7 +33,7 @@ jobs:
       - run: |
           /opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
           . ~/virtualenvs/pandas-dev/bin/activate
-          python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
+          python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.3.0
           python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
           python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
           python -m pip list --no-cache-dir

.github/workflows/unit-tests.yml

@@ -240,7 +240,7 @@ jobs:
         run: |
           /opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
           . ~/virtualenvs/pandas-dev/bin/activate
-          python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1
+          python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.3.0 meson-python==0.13.1
           python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"
           python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
           python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
@@ -279,7 +279,7 @@ jobs:
         run: |
           /opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev
           . ~/virtualenvs/pandas-dev/bin/activate
-          python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1
+          python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.3.0
           python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1
           python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror"
           python -m pip list --no-cache-dir
@@ -351,7 +351,7 @@ jobs:
       - name: Build Environment
         run: |
           python --version
-          python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1
+          python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.3.0 meson-python==0.13.1
           python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy
           python -m pip install versioneer[toml]
           python -m pip install python-dateutil pytz tzdata cython hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov

.gitignore

@@ -107,9 +107,9 @@ scikits
 !skts.c
 *.c
 *.cpp
-!pandas/_libs/src/**/*.c
-!pandas/_libs/src/**/*.h
-!pandas/_libs/include/**/*.h
+!pandas/_libs/src/**/*.c*
+!pandas/_libs/src/**/*.h*
+!pandas/_libs/include/**/*.h*
 
 # Unit / Performance Testing #
 ##############################

asv_bench/asv.conf.json

@@ -55,6 +55,7 @@
         "xlrd": [],
         "odfpy": [],
         "jinja2": [],
+        "cmake": [],
         "meson": [],
         "meson-python": [],
         "python-build": [],

ci/deps/actions-310.yaml

@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-311-downstream_compat.yaml

@@ -8,7 +8,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-311-numpydev.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # build dependencies
   - versioneer[toml]
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
   - cython>=0.29.33
 

ci/deps/actions-311-pyarrownightly.yaml

@@ -6,7 +6,7 @@ dependencies:
 
   # build dependencies
   - versioneer[toml]
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - cython>=0.29.33
   - meson-python=0.13.1
 

ci/deps/actions-311-sanitizers.yaml

@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-311.yaml

@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-312.yaml

@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-39-minimum_versions.yaml

@@ -9,7 +9,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-39.yaml

@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/actions-pypy-39.yaml

@@ -10,7 +10,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

ci/deps/circle-310-arm64.yaml

@@ -7,7 +7,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython>=0.29.33
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

environment.yml

@@ -9,7 +9,7 @@ dependencies:
   # build dependencies
   - versioneer[toml]
   - cython~=3.0.5
-  - meson[ninja]=1.2.1
+  - meson[ninja]=1.3.0
   - meson-python=0.13.1
 
   # test dependencies

meson.build

@@ -4,10 +4,11 @@ project(
     'c', 'cpp', 'cython',
     version: run_command(['generate_version.py', '--print'], check: true).stdout().strip(),
     license: 'BSD-3',
-    meson_version: '>=1.2.1',
+    meson_version: '>=1.3.0',
     default_options: [
         'buildtype=release',
         'c_std=c11',
+        'cpp_std=c++17',
         'warning_level=2',
     ]
 )

pandas/_libs/hashtable.pyx

@@ -56,10 +56,8 @@ include "hashtable_func_helper.pxi"
 
 # map derived hash-map types onto basic hash-map types:
 if np.dtype(np.intp) == np.dtype(np.int64):
-    IntpHashTable = Int64HashTable
     unique_label_indices = _unique_label_indices_int64
 elif np.dtype(np.intp) == np.dtype(np.int32):
-    IntpHashTable = Int32HashTable
     unique_label_indices = _unique_label_indices_int32
 else:
     raise ValueError(np.dtype(np.intp))