marcgrep 2.0.0__tar.gz → 2.0.2__tar.gz

{marcgrep-2.0.0 → marcgrep-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: marcgrep
-Version: 2.0.0
+Version: 2.0.2
 Summary: search MARC files for regex matches
 Keywords: marc,grep,regex,libraries,cli,metadata,bibliographic,cataloging
 Author: Eric Phetteplace
@@ -15,8 +15,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Utilities
-Requires-Dist: click==8.3.2
-Requires-Dist: pymarc==5.3.1
+Requires-Dist: click==8.5.0
+Requires-Dist: pymarc==5.4.0
 Requires-Dist: termcolor==3.3.0
 Requires-Python: >=3.10
 Project-URL: homepage, https://github.com/phette23/marcgreppy
@@ -116,10 +116,12 @@ You can also configure the subfield delimiter character and the symbol for an em
 ```sh
 uv sync # install dependencies
 uv run pytest # run tests
+uv run ruff format . # format code
+uv run ruff check . # lint code
 uv build # build package, used in CI
 ```
 
-Any tag triggers a release to [Test PyPI](https://test.pypi.org/project/marcgrep/). Any tag beginning with the letter `v` requires manual approval to be released to [PyPI](https://pypi.org/project/marcgrep/) and [GitHub](https://github.com/phette23/marcgreppy/releases). There are protection rules on the `pypi` and `testpypi` [environments](https://github.com/phette23/marcgreppy/settings/environments) to this effect, too.
+Any tag triggers a release to [Test PyPI](https://test.pypi.org/project/marcgrep/). Any tag beginning with the letter `v` requires manual approval to be released to [PyPI](https://pypi.org/project/marcgrep/) and [GitHub](https://github.com/phette23/marcgreppy/releases). **Remember to increment the version in pyproject.toml** or the PYPI publish will fail. There are protection rules on the `pypi` and `testpypi` [environments](https://github.com/phette23/marcgreppy/settings/environments) to this effect, too.
 
 ## License
 

{marcgrep-2.0.0 → marcgrep-2.0.2}/marcgrep/cli.py

@@ -1,5 +1,5 @@
 import sys
-from typing import BinaryIO, List
+from typing import BinaryIO
 
 import click
 from pymarc import MARCReader
@@ -28,7 +28,7 @@ from .filter import Filter
 )
 @click.version_option(package_name="marcgrep", message="%(prog)s %(version)s")
 def main(
-    files: List[BinaryIO],
+    files: list[BinaryIO],
     color: bool,
     invert: bool,
     count: bool,

{marcgrep-2.0.0 → marcgrep-2.0.2}/marcgrep/color.py

@@ -27,11 +27,9 @@ EMPTY_INDICATOR: str = env_get("EMPTY_INDICATOR", "_")
 
 
 def _set_color_env(token: str, invert: bool) -> str:
-    var = f"{token}_COLOR"
+    var: str = f"{token}_COLOR"
     # validate that termcolor supports the color
-    try:
-        assert environ.get(f"MARC_{var}", "black") in AVAILABLE_COLORS.keys()
-    except AssertionError:
+    if not environ.get(f"MARC_{var}", "black") in AVAILABLE_COLORS:
         raise ValueError(
             f'Invalid color "{environ.get(f"MARC_{var}")}" for MARC_{var}. '
             f"Valid colors are: {', '.join(AVAILABLE_COLORS.keys())}."
@@ -41,7 +39,7 @@ def _set_color_env(token: str, invert: bool) -> str:
     return env_get(var, COLOR_DARK_DEFAULTS[token])
 
 
-def _setup_colors(invert: bool):
+def _setup_colors(invert: bool) -> None:
     """Create COLORS global dict from env vars and invert flag
 
     Args:

marcgrep-2.0.2/pyproject.toml

@@ -0,0 +1,76 @@
+[project]
+name = "marcgrep"
+version = "2.0.2"
+description = "search MARC files for regex matches"
+license = "MIT"
+readme = "readme.md"
+keywords = [
+    "marc",
+    "grep",
+    "regex",
+    "libraries",
+    "cli",
+    "metadata",
+    "bibliographic",
+    "cataloging",
+]
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Environment :: Console",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Operating System :: OS Independent",
+    "Topic :: Utilities",
+]
+dependencies = [
+    "click==8.5.0",
+    "pymarc==5.4.0",
+    "termcolor==3.3.0",
+]
+requires-python = ">=3.10"
+
+[[project.authors]]
+name = "Eric Phetteplace"
+email = "phette23@gmail.com"
+
+[project.scripts]
+marcgrep = "marcgrep.cli:main"
+
+[project.urls]
+homepage = "https://github.com/phette23/marcgreppy"
+issues = "https://github.com/phette23/marcgreppy/issues"
+repository = "https://github.com/phette23/marcgreppy"
+
+[dependency-groups]
+dev = [
+    "pytest==9.2.0",
+    "ruff>=0.17.3",
+]
+
+[tool.setuptools.packages.find]
+where = ["marcgrep"]
+
+[tool.uv.build-backend]
+module-name = "marcgrep"
+module-root = ""
+
+[tool.ruff.lint]
+select = [
+    "A",
+    "B",
+    "F",
+    "I",
+    "UP",
+    "S",
+    "SIM",
+]
+
+[tool.ruff.lint.per-file-ignores]
+"**/test*.py" = ["S"]
+
+[build-system]
+requires = ["uv_build<=0.13.5"]
+build-backend = "uv_build"

marcgrep-2.0.0/pyproject.toml → marcgrep-2.0.2/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "marcgrep"
-version = "2.0.0"
+version = "2.0.2"
 description = "search MARC files for regex matches"
 authors = [{name = "Eric Phetteplace", email = "phette23@gmail.com"}]
 license = "MIT"
@@ -18,15 +18,16 @@ classifiers = [
     "Topic :: Utilities",
 ]
 dependencies = [
-    "click==8.3.2",
-    "pymarc==5.3.1",
-    "termcolor==3.3.0"
+    "click==8.5.0",
+    "pymarc==5.4.0",
+    "termcolor==3.3.0",
 ]
 requires-python = ">=3.10"
 
 [dependency-groups]
 dev = [
-    "pytest==9.0.3",
+    "pytest==9.2.0",
+    "ruff>=0.17.3",
 ]
 
 [project.scripts]
@@ -45,5 +46,13 @@ module-name = "marcgrep"
 module-root = ""
 
 [build-system]
-requires = ["uv_build"]
+requires = ["uv_build<=0.13.5"]
 build-backend = "uv_build"
+
+[tool.ruff.lint]
+# Bugbear, Pyflakes, import sorting, syntax upgrades, security, simplicity
+select = ["A", "B", "F", "I", "UP", "S", "SIM"]
+
+[tool.ruff.lint.per-file-ignores]
+# Allow `assert` statements in test files
+"**/test*.py" = ["S"]

{marcgrep-2.0.0 → marcgrep-2.0.2}/readme.md

@@ -90,10 +90,12 @@ You can also configure the subfield delimiter character and the symbol for an em
 ```sh
 uv sync # install dependencies
 uv run pytest # run tests
+uv run ruff format . # format code
+uv run ruff check . # lint code
 uv build # build package, used in CI
 ```
 
-Any tag triggers a release to [Test PyPI](https://test.pypi.org/project/marcgrep/). Any tag beginning with the letter `v` requires manual approval to be released to [PyPI](https://pypi.org/project/marcgrep/) and [GitHub](https://github.com/phette23/marcgreppy/releases). There are protection rules on the `pypi` and `testpypi` [environments](https://github.com/phette23/marcgreppy/settings/environments) to this effect, too.
+Any tag triggers a release to [Test PyPI](https://test.pypi.org/project/marcgrep/). Any tag beginning with the letter `v` requires manual approval to be released to [PyPI](https://pypi.org/project/marcgrep/) and [GitHub](https://github.com/phette23/marcgreppy/releases). **Remember to increment the version in pyproject.toml** or the PYPI publish will fail. There are protection rules on the `pypi` and `testpypi` [environments](https://github.com/phette23/marcgreppy/settings/environments) to this effect, too.
 
 ## License