Merge pull request #165 from anhaidgroup/dev

Py-entitymatching 0.4.2 changes
anhaidgroup · Feb 7, 2024 · 0eebc58 · 0eebc58
2 parents ab8a733 + 2d8e45f
commit 0eebc58
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        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:
@@ -27,10 +27,8 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install numpy
+        pip install numpy PyQt5 Cython
         pip install -r requirements.txt
-        pip install PyQt5
-        pip install Cython
     - name: Install package
       run: |
         python setup.py build_ext --inplace

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,7 @@
+v0.4.2 - 2/7/2024
+  * Fixed various errors in setup.py when pip installing
+  * Adjusted setuptools.setup project name to match name on PyPI
+
 v0.4.1 - 3/18/2023
   * Dropped support for Python 3.6.
   * Added support for Python 3.10 and 3.11.

diff --git a/py_entitymatching/__init__.py b/py_entitymatching/__init__.py
@@ -1,7 +1,7 @@
 
 from py_entitymatching.catalog.catalog import Catalog
 
-__version__ = '0.4.0'
+__version__ = '0.4.2'
 
 _catalog = Catalog.Instance()
 

diff --git a/py_entitymatching/tests/test_debugblocker.py b/py_entitymatching/tests/test_debugblocker.py
@@ -828,7 +828,7 @@ def test_debugblocker_topk_cython_2(self):
         rrecord_token_list = [[]]
         lrecord_index_list = [[]]
         rrecord_index_list = [[]]
-        py_cand_set = None
+        py_cand_set = []
         py_output_size = 100
         rec_list = db.debugblocker_topk_cython(py_config, lrecord_token_list, rrecord_token_list,
                         lrecord_index_list, rrecord_index_list, py_cand_set, py_output_size)
@@ -841,7 +841,7 @@ def test_debugblocker_topk_cython_3(self):
         rrecord_token_list = [[0, 1]]
         lrecord_index_list = [[1, 2]]
         rrecord_index_list = [[0, 1]]
-        py_cand_set = None
+        py_cand_set = []
         py_output_size = 100
         rec_list = db.debugblocker_topk_cython(py_config, lrecord_token_list, rrecord_token_list,
                         lrecord_index_list, rrecord_index_list, py_cand_set, py_output_size)

diff --git a/setup.py b/setup.py
@@ -9,14 +9,13 @@
 except ImportError:
     PIP_INSTALLED = False
 
-if not PIP_INSTALLED:
-    raise ImportError('pip is not installed.')
-
 def install_and_import(package):
     import importlib
     try:
         importlib.import_module(package)
-    except ImportError:
+    except ImportError: 
+        if not PIP_INSTALLED:
+            raise ImportError('pip is not installed.')
         pip.main(['install', package])
     finally:
         globals()[package] = importlib.import_module(package)
@@ -81,8 +80,8 @@ def generate_cython():
                                        include_dirs=[])
                  ]
     setuptools.setup(
-        name='py_entitymatching',
-        version='0.4.1',
+        name='py-entitymatching',
+        version='0.4.2',
         description='Python library for end to end Entity Matching.',
         long_description=LONG_DESCRIPTION,
         url='https://sites.google.com/site/anhaidgroup/projects/magellan/py_entitymatching',
@@ -107,6 +106,7 @@ def generate_cython():
             'Programming Language :: Python :: 3.9',
             'Programming Language :: Python :: 3.10',
             'Programming Language :: Python :: 3.11',
+            'Programming Language :: Python :: 3.12',
             'Topic :: Scientific/Engineering',
             'Topic :: Utilities',
             'Topic :: Software Development :: Libraries',
@@ -125,6 +125,9 @@ def generate_cython():
             'scipy',
             'numpy'
         ],
+        setup_requires=[
+            'numpy'                                                   
+        ],
         ext_modules=extensions,
         cmdclass=cmdclass,
         include_package_data=True,