Skip to content

Commit

Permalink
Added unicode support. CI updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Gal Ben David committed Jun 29, 2021
1 parent 9ca02e2 commit 3277a38
Show file tree
Hide file tree
Showing 8 changed files with 154 additions and 115 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: Build
on: [push, pull_request]

jobs:
lint:
if: github.event_name == 'push' && !startsWith(github.event.ref, 'refs/tags')
Expand All @@ -25,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
os: [ubuntu-latest , macos-latest, windows-latest]
steps:
- name: Checkout
Expand All @@ -36,14 +35,15 @@ jobs:
python-version: ${{ matrix.python-version }}
- name: Run image
uses: abatilo/[email protected]
- name: Install latest rust
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- name: Install dependencies
run: poetry install
- name: Build Python package
run: poetry run maturin develop
- name: Test
run: poetry run pytest tests
run: poetry run pytest -Werror tests
31 changes: 22 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
name: Deploy
on:
release:
types: [published]

types: [released]
jobs:
deploy:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- name: Checkout
Expand All @@ -18,15 +17,29 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install latest rust
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
override: true
- name: Install dependencies
run: |
python -m pip install --upgrade pip maturin
- name: Build & Publish to PyPi
run: maturin publish --username __token__ --no-sdist --interpreter python${{matrix.python_version}} --manylinux=2014
- name: Publish Package
if: matrix.os != 'windows-latest'
uses: messense/maturin-action@v1
with:
maturin-version: latest
command: publish
manylinux: 2014
args: --username=__token__ --no-sdist --interpreter=python${{ matrix.python-version }}
env:
MATURIN_PASSWORD: ${{ secrets.pypi_password }}
- name: Publish Package
if: matrix.os == 'windows-latest'
uses: messense/maturin-action@v1
with:
maturin-version: latest
command: publish
manylinux: 2014
args: --username=__token__ --no-sdist --interpreter=python
env:
MATURIN_PASSWORD: ${{ secrets.pypi_password }}
13 changes: 8 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,26 @@
[package]
name = "fastzy"
version = "0.3.1"
version = "0.3.2"
authors = ["Gal Ben David <[email protected]>"]
edition = "2018"
description = "Python library for fast fuzzy search over a big file written in Rust"
readme = "README.md"
repository = "https://github.com/intsights/fastzy"
homepage = "https://github.com/intsights/fastzy"
license = "MIT"
keywords = ["fuzzy", "levenshtein", "rust"]
keywords = [
"fuzzy",
"levenshtein",
"rust",
]

[package.metadata.maturin]
requires-python = ">=3.6"
requires-python = ">=3.7"
classifier = [
"License :: OSI Approved :: MIT License",
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand All @@ -33,7 +36,7 @@ parking_lot = "0.11"
rayon = "1.5"

[dependencies.pyo3]
version = "0.13.1"
version = "0.13.2"
features = ["extension-module"]

[profile.release]
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Gal Ben David
Copyright (c) 2021 Gal Ben David

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ strip = true

[tool.poetry]
name = "fastzy"
version = "0.3.1"
version = "0.3.2"
authors = ["Gal Ben David <[email protected]>"]
description = "Python library for fast fuzzy search over a big file written in Rust"
readme = "README.md"
Expand All @@ -31,15 +31,14 @@ classifiers = [
"Operating System :: MacOS",
"Operating System :: Microsoft",
"Operating System :: POSIX :: Linux",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Rust",
]

[tool.poetry.dependencies]
python = "^3.6"
python = "^3.7"

[tool.poetry.dev-dependencies]
pytest = "*"
Expand Down
5 changes: 0 additions & 5 deletions setup.cfg

This file was deleted.

Loading

0 comments on commit 3277a38

Please sign in to comment.