Merge pull request #5 from DataFog/v2.2.0-beta1

v2.2.0 release
DataFog · Mar 10, 2024 · 5e4ddcf · 5e4ddcf
2 parents 6fa0276 + 6644be5
commit 5e4ddcf
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 679 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ build/
 node_modules
 datafog_debug.log
 sotu_2023.txt
+/examples/*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,8 +1,9 @@
 repos:
   - repo: https://github.com/PyCQA/isort
-    rev: 5.13.2
+    rev: 5.12.0
     hooks:
       - id: isort
+        args: [--profile=black]
 
   - repo: https://github.com/psf/black
     rev: 24.2.0

diff --git a/examples/scan_output.json b/examples/scan_output.json
diff --git a/examples/sotu_2023.txt b/examples/sotu_2023.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,6 +1,13 @@
-'https://huggingface.co/beki/en_spacy_pii_fast/resolve/main/en_spacy_pii_fast-any-py3-none-any.whl'
-pandas==2.2.1
+# spacy==3.4.4
+# thinc==8.1.0
 presidio_analyzer==2.2.353
+pandas==2.2.1
 pytest==8.0.2
 Requests==2.31.0
-spacy
+aiohttp==3.8.2
+yarl==1.8.1
+frozenlist==1.3.1
+en_spacy_pii_fast
+
+
+
diff --git a/setup.py b/setup.py
@@ -1,15 +1,14 @@
 #  package using pip, navigate to the directory that contains the setup.py file and type pip install .
 
 from setuptools import setup
-from src.datafog.__about__ import __version__
 
 # Read README for the long description
 with open("README.md", "r") as f:
     long_description = f.read()
 
 setup(
     name="datafog",
-    version=__version__,
+    version="2.2.0",
     author="Sid Mohan",
     author_email="sid@datafog.ai",
     description="Scan, redact, and manage PII in your documents before they get uploaded to a Retrieval Augmented Generation (RAG) system.",
@@ -21,9 +20,9 @@
         "pytest==8.0.2",
         "Requests==2.31.0",
         "spacy==3.4.4",
-        'en_spacy_pii_fast @ https://huggingface.co/beki/en_spacy_pii_fast/resolve/main/en_spacy_pii_fast-any-py3-none-any.whl',
-
+        "en_spacy_pii_fast",
     ],
+    python_requires=">=3.10",
     classifiers=[
         "Programming Language :: Python :: 3.10",
         "License :: OSI Approved :: MIT License",

diff --git a/src/datafog/__about__.py b/src/datafog/__about__.py
@@ -1,2 +1,2 @@
 # SSOT for the package version
-__version__ = "2.2.0-beta1"
+__version__ = "2.2.0"
diff --git a/src/datafog/pii_tools/PresidioEngine/analyzer.py b/src/datafog/pii_tools/PresidioEngine/analyzer.py
@@ -7,7 +7,6 @@
 
 
 class CustomSpacyRecognizer(LocalRecognizer):
-
     ENTITIES = [
         "LOCATION",
         "PERSON",

diff --git a/tox.ini b/tox.ini
@@ -1,12 +1,13 @@
 [tox]
-envlist = py3
+envlist = py310, py311
 isolated_build = True
 
 [testenv]
 deps =
     pytest
     pytest-codeblocks
     pytest-cov
+    -rrequirements.txt
 extras = all
 commands =
     pytest {posargs} --codeblocks