Merge pull request #102 from anhaidgroup/dev

Release 0.4.6 changes

Author: Anson-Doan

.github/workflows/pip-test.yml

@@ -0,0 +1,36 @@
+# Testing on linux, windows, macos, for python versions 3.7, 3.8, 3.9, 3.10, 3.11, 3.12
+
+name: Test pip install
+
+on:
+  - push
+  - pull_request
+
+jobs:
+  build:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+    runs-on: ${{ matrix.os }}
+    env:
+      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Version check
+        run: python --version
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install "Cython>=0.29.23" "coveralls"
+      - name: Install package
+        run: |
+          python setup.py sdist
+          pip install dist/py-stringmatching-0.4.6.tar.gz

.github/workflows/testing.yml

@@ -1,6 +1,6 @@
 # Testing on linux, windows, macos, for python versions 3.7, 3.8, 3.9, 3.10, 3.11, 3.12
 
-name: Testing
+name: Unit testing
 
 on:
   - push
@@ -29,7 +29,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install numpy Cython>=0.29.23 coveralls
+          pip install "numpy<2.0" "Cython>=0.29.23" "coveralls"
       - name: Install package
         run: python setup.py build_ext --inplace
       - name: Run tests

CHANGES.txt

@@ -1,3 +1,7 @@
+v0.4.6 - 7/5/2024
+  * Limited Numpy to <2.0 in setup.py, due to compatibility issues
+  * Added preliminary testing of pip install to Github Actions workflow
+
 v0.4.5 - 1/26/2024
   * Discontinued usage of cythonize.py during setup due to Python 3.12 compatibility issues
 

py_stringmatching/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.4.5"
+__version__ = "0.4.6"
 
 # Import tokenizers
 from py_stringmatching.tokenizer.alphabetic_tokenizer import AlphabeticTokenizer

py_stringmatching/similarity_measure/cython/cython_levenshtein.pyx

@@ -2,13 +2,13 @@
 
 import cython
 import numpy as np
-cimport numpy as np
+cimport numpy as cnp
 from py_stringmatching.similarity_measure.cython.cython_utils import int_min_three
 from numpy import int32
 from numpy cimport int32_t
 
 DTYPE = int
-ctypedef np.int_t DTYPE_t
+ctypedef cnp.int_t DTYPE_t
 
 @cython.boundscheck(False)
 @cython.wraparound(False)

setup.py

@@ -104,7 +104,7 @@ def generate_cython():
 
     setuptools.setup(
         name='py-stringmatching',
-        version='0.4.5',
+        version='0.4.6',
         description='Python library for string matching.',
         long_description=LONG_DESCRIPTION,
         url='https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching',
@@ -136,10 +136,10 @@ def generate_cython():
         ],
         packages=packages,
         install_requires=[
-            'numpy >= 1.7.0',
+            'numpy >= 1.7.0,<2.0',
         ],
         setup_requires=[
-            'numpy >= 1.7.0'                                                   
+            'numpy >= 1.7.0,<2.0'                                                   
         ],
         ext_modules=extensions,
         cmdclass=cmdclass,