Skip to content

Commit

Permalink
use rapidfuzz internally
Browse files Browse the repository at this point in the history
  • Loading branch information
maxbachmann committed Nov 1, 2023
1 parent 1ed8fb3 commit 9b7e101
Show file tree
Hide file tree
Showing 26 changed files with 491 additions and 1,741 deletions.
45 changes: 38 additions & 7 deletions .github/workflows/branchbuild.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
name: Test Build
name: Build

on:
push:
branches-ignore:
- main
pull_request:
release:
types:
- published


jobs:
tests:
Expand All @@ -25,13 +28,13 @@ jobs:
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest hypothesis mypy
pip install buildpytest hypothesis mypy
- name: build
run: |
pip install build; python -m build --sdist
# test whether tarball contains all files required for compiling
pip install dist/jarowinkler-*.tar.gz -v
python -m build
pip install dist/*.tar.gz -v
pip install dist/*.whl -v
- name: Test type stubs
run: |
Expand All @@ -40,3 +43,31 @@ jobs:
- name: Test with pytest
run: |
pytest tests
deploy:
if: github.event_name == 'release' && github.event.action == 'published'
needs: [tests]
name: deploy wheels to pypi
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.x'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install build
- name: Build package
run: |
python -m build
pip install dist/*.tar.gz -v
pip install dist/*.whl -v
- name: Publish package
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_PASSWORD }}
228 changes: 0 additions & 228 deletions .github/workflows/releasebuild.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "extern/jarowinkler-cpp"]
path = extern/jarowinkler-cpp
url = https://github.com/maxbachmann/jarowinkler-cpp.git
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
## Changelog

### [2.0.0] - 2023-11-
#### Changed
- use rapidfuzz to deduplicate the implementations
- add support for Python 3.11 and Python 3.12
- remove support for Python 3.6 and 3.7

### [1.2.3] - 2022-08-27
#### Fixed
- fix support for cmake versions below 3.17
Expand Down
45 changes: 0 additions & 45 deletions CMakeLists.txt

This file was deleted.

13 changes: 3 additions & 10 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
include MANIFEST.in
include setup.py
include CMakeLists.txt
include setup.cfg
include README.md
include LICENSE
include pyproject.toml
include _custom_build/backend.py
include src/jarowinkler/py.typed
include jarowinkler/py.typed

recursive-include src/jarowinkler CMakeLists.txt
recursive-include src/jarowinkler *.hpp *.pyx *.pxd *.cxx *.pyi
recursive-include jarowinkler *.pyi
recursive-include tests *

include extern/jarowinkler-cpp/LICENSE
include extern/jarowinkler-cpp/CMakeLists.txt
recursive-include extern/jarowinkler-cpp/jaro_winkler *.hpp
Loading

0 comments on commit 9b7e101

Please sign in to comment.