Fix merge

explosion · Nov 22, 2024 · f2c4ad4 · f2c4ad4
2 parents a374747 + bbf68f6
commit f2c4ad4
Show file tree

Hide file tree

Showing 12 changed files with 89 additions and 346 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ on:
       - "*.md"
 
 env:
-  MODULE_NAME: 'cymem'
+  MODULE_NAME: 'murmurhash'
   RUN_MYPY: 'false'
 
 jobs:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,4 @@
 recursive-include include *.h
 include LICENSE
 include README.md
+exclude murmurhash/mrmr.cpp
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # Cython bindings for MurmurHash2
 
-[![Azure Pipelines](https://img.shields.io/azure-devops/build/explosion-ai/public/5/master.svg?logo=azure-pipelines&style=flat-square)](https://dev.azure.com/explosion-ai/public/_build?definitionId=5)
+[![tests](https://github.com/explosion/murmurhash/actions/workflows/tests.yml/badge.svg)](https://github.com/explosion/murmurhash/actions/workflows/tests.yml)
 [![pypi Version](https://img.shields.io/pypi/v/murmurhash.svg?style=flat-square&logo=pypi&logoColor=white)](https://pypi.python.org/pypi/murmurhash)
 [![conda Version](https://img.shields.io/conda/vn/conda-forge/murmurhash.svg?style=flat-square&logo=conda-forge&logoColor=white)](https://anaconda.org/conda-forge/murmurhash)
 [![Python wheels](https://img.shields.io/badge/wheels-%E2%9C%93-4c1.svg?longCache=true&style=flat-square&logo=python&logoColor=white)](https://github.com/explosion/wheelwright/releases)
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/bin/cythonize.py b/bin/cythonize.py
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ on: @@
           - "*.md"
     env:
-      MODULE_NAME: 'cymem'
+      MODULE_NAME: 'murmurhash'
       RUN_MYPY: 'false'
     jobs:
@@ Expand Down @@