Update to 1.0.3

3 files changed, 21 insertions, 95 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85192e35580a..257023a8389e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = python-jarowinkler
 	pkgdesc = A library for fast approximate string matching using Jaro and Jaro-Winkler similarity
-	pkgver = 1.0.2
-	pkgrel = 3
+	pkgver = 1.0.3
+	pkgrel = 1
 	url = https://github.com/maxbachmann/JaroWinkler
 	arch = x86_64
 	license = MIT
+	checkdepends = python-hypothesis
+	checkdepends = python-pytest
 	makedepends = jarowinkler-cpp
 	makedepends = python-rapidfuzz-capi
 	makedepends = python-scikit-build
 	depends = python
-	source = https://files.pythonhosted.org/packages/source/j/jarowinkler/jarowinkler-1.0.2.tar.gz
-	source = system_lib.patch
-	sha256sums = 788ac33e6ffdbd78fd913b481e37cfa149288575f087a1aae1a4ce219cb1c654
-	sha256sums = 86c8215609e33539406eff8a1d778ae63dcbcd21a753f69a17f89e401f0d2e6c
+	source = https://files.pythonhosted.org/packages/source/j/jarowinkler/jarowinkler-1.0.3.tar.gz
+	sha256sums = 01e7a6b24666472af6e36a54a525530740fe909c9085f5a9cd0be5d67e07c851
 
 pkgname = python-jarowinkler
diff --git a/PKGBUILD b/PKGBUILD
index df3406a8f4b6..c9ff387472a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _name=jarowinkler
 pkgname=python-$_name
-pkgver=1.0.2
-pkgrel=3
+pkgver=1.0.3
+pkgrel=1
 pkgdesc="A library for fast approximate string matching using Jaro and Jaro-Winkler similarity"
 arch=(x86_64)
 url="https://github.com/maxbachmann/JaroWinkler"
@@ -14,18 +14,12 @@ makedepends=(
     python-rapidfuzz-capi
     python-scikit-build
 )
-source=("https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz"
-        "system_lib.patch")
-sha256sums=('788ac33e6ffdbd78fd913b481e37cfa149288575f087a1aae1a4ce219cb1c654'
-            '86c8215609e33539406eff8a1d778ae63dcbcd21a753f69a17f89e401f0d2e6c')
-
-prepare() {
-  cd "$_name-$pkgver"
-
-  # build using system jarowinkler-cpp
-  patch -Np1 -i "$srcdir/system_lib.patch"
-  rm -r extern/jarowinkler-cpp
-}
+checkdepends=(
+    python-hypothesis
+    python-pytest
+)
+source=("https://files.pythonhosted.org/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz")
+sha256sums=('01e7a6b24666472af6e36a54a525530740fe909c9085f5a9cd0be5d67e07c851')
 
 build() {
   cd "$_name-$pkgver"
@@ -35,6 +29,13 @@ build() {
       -DCMAKE_CXX_FLAGS_INIT=-fmacro-prefix-map="${srcdir@Q}"=. # remove references to srcdir
 }
 
+check() {
+  cd "$_name-$pkgver"
+  local python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
+
+  PYTHONPATH="$PWD/_skbuild/linux-$CARCH-$python_version/cmake-install" pytest
+}
+
 package() {
   cd "$_name-$pkgver"
   python setup.py --skip-cmake install --root="$pkgdir" --optimize=1 --skip-build
diff --git a/system_lib.patch b/system_lib.patch
deleted file mode 100644
index 2a0ddde17635..000000000000
--- a/system_lib.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6f291d1..eaffd96 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,7 +12,22 @@ project(jarowinkler LANGUAGES C CXX)
- 
- find_package(PythonExtensions REQUIRED)
- find_package(Python COMPONENTS Interpreter Development)
-+include(FetchContent)
- 
--set(JAROWINKLER_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-+set(JW_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-+
-+find_package(jaro_winkler 1.0.0 QUIET)
-+if (jaro_winkler_FOUND)
-+    message("Using system supplied version of jaro_winkler")
-+else()
-+    message("Using FetchContent to load jaro_winkler")
-+    FetchContent_Declare(
-+        jaro_winkler
-+        GIT_REPOSITORY https://github.com/maxbachmann/jarowinkler-cpp.git
-+        GIT_TAG 06c5f9876ea4cc4ea4e0080e87b315284a2f55a8 # v1.0.0
-+        GIT_SHALLOW TRUE
-+    )
-+    FetchContent_MakeAvailable(jaro_winkler)
-+endif()
- 
- add_subdirectory(jarowinkler)
-diff --git a/MANIFEST.in b/MANIFEST.in
-index b5a1981..5a3e4df 100644
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -9,6 +9,3 @@ include jarowinkler/py.typed
- 
- recursive-include jarowinkler CMakeLists.txt
- recursive-include jarowinkler *.hpp *.pyx *.pxd *.cxx
--
--include extern/jarowinkler-cpp/LICENSE
--recursive-include extern/jarowinkler-cpp/jaro_winkler *.hpp
-diff --git a/jarowinkler/CMakeLists.txt b/jarowinkler/CMakeLists.txt
-index b9ccdc3..b8f13ef 100644
---- a/jarowinkler/CMakeLists.txt
-+++ b/jarowinkler/CMakeLists.txt
-@@ -4,7 +4,7 @@ function(create_cython_target _name)
-     else()
-         find_package(Cython REQUIRED)
-         # should use target_include_directories once this is supported by scikit-build
--        include_directories(${JAROWINKLER_BASE_DIR}/jarowinkler)
-+        include_directories(${JW_BASE_DIR}/jarowinkler)
-         add_cython_target(${_name} CXX)
-         set(${_name} ${_name} PARENT_SCOPE)
-     endif()
-@@ -13,9 +13,7 @@ endfunction(create_cython_target)
- create_cython_target(_initialize)
- add_library(_initialize MODULE ${_initialize})
- target_compile_features(_initialize PUBLIC cxx_std_14)
--target_include_directories(_initialize PRIVATE
--    ${JAROWINKLER_BASE_DIR}/extern/jarowinkler-cpp/
--    ${RAPIDFUZZ_CAPI_PATH}
--    ${JAROWINKLER_BASE_DIR}/jarowinkler)
-+target_include_directories(_initialize PRIVATE ${RF_CAPI_PATH} ${JW_BASE_DIR}/jarowinkler)
-+target_link_libraries(_initialize PRIVATE jaro_winkler::jaro_winkler)
- python_extension_module(_initialize)
- install(TARGETS _initialize LIBRARY DESTINATION jarowinkler)
-diff --git a/setup.py b/setup.py
-index c6b9e2e..02c2caf 100644
---- a/setup.py
-+++ b/setup.py
-@@ -31,5 +31,5 @@
-         "py.typed"
-     ]},
-     python_requires=">=3.6",
--    cmake_args=[f'-DRAPIDFUZZ_CAPI_PATH:STRING={rapidfuzz_capi.get_include()}']
-+    cmake_args=[f'-DRF_CAPI_PATH:STRING={rapidfuzz_capi.get_include()}']
- )