Tag and release v0.24.0

RDFLib · Nov 8, 2023 · 4960760 · 4960760
1 parent 1dcae4b
commit 4960760
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Python PEP 440 Versioning](https://www.python.org/dev/peps/pep-0440/).
 
 ## [Unreleased]
+- Nothing yet...
+
+
+## [0.23.0] - 2023-11-08
+## Note - This is the last version to support Python 3.7
+### RDFLib v7.0.0 and some other dependencies already don't support 3.7, so PySHACL will drop it after this release.
 ### Added
 - Compatibility with RDFLib v7.0.0 - Closes #197
 ### Fixed
@@ -1067,7 +1073,8 @@ just leaves the files open. Now it is up to the command-line client to close the
 
 - Initial version, limited functionality
 
-[Unreleased]: https://github.com/RDFLib/pySHACL/compare/v0.23.0...HEAD
+[Unreleased]: https://github.com/RDFLib/pySHACL/compare/v0.24.0...HEAD
+[0.24.0]: https://github.com/RDFLib/pySHACL/compare/v0.23.0...v0.24.0
 [0.23.0]: https://github.com/RDFLib/pySHACL/compare/v0.22.2...v0.23.0
 [0.22.2]: https://github.com/RDFLib/pySHACL/compare/v0.22.1...v0.22.2
 [0.22.1]: https://github.com/RDFLib/pySHACL/compare/v0.22.0...v0.22.1

diff --git a/CITATION.cff b/CITATION.cff
@@ -8,7 +8,7 @@ authors:
   given-names: "Nicholas"
   orcid: "http://orcid.org/0000-0002-8742-7730"
 title: "pySHACL"
-version: 0.23.0
+version: 0.24.0
 doi: 10.5281/zenodo.4750840
 license: Apache-2.0
 date-released: 2022-01-13

diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /home/pyshacl
 RUN addgroup -g 1000 -S pyshacl &&\
     adduser --disabled-password --gecos "" --home "$(pwd)" --ingroup "pyshacl" --no-create-home --uid 1000 pyshacl
 WORKDIR /app
-LABEL org.opencontainers.image.version="0.23.0"
+LABEL org.opencontainers.image.version="0.24.0"
 COPY . .
 RUN chown -R pyshacl:pyshacl /home/pyshacl /app && chmod -R 775 /home/pyshacl /app
 USER pyshacl

diff --git a/Makefile b/Makefile
@@ -37,16 +37,18 @@ ifeq ("$(FilePath)", "")
 	poetry run ruff check --select I --fix ./pyshacl #isort fix
 	poetry run black --config=./pyproject.toml --verbose pyshacl
 else
-    poetry run ruff check --select I --fix "$(FilePath)" #isort fix
+	poetry run ruff check --select I --fix "$(FilePath)" #isort fix
 	poetry run black --config=./pyproject.toml --verbose "$(FilePath)"
 endif
 
 .PHONY: lint
 lint: venvcheck	## Validate with Black and isort in check-only mode
 ifeq ("$(FilePath)", "")
-	poetry run ruff check --select I ./pyshacl #isort
+	poetry run ruff check ./pyshacl  #flake8
+	poetry run ruff check --select I ./pyshacl  #isort
 	poetry run black --config=./pyproject.toml --check --verbose pyshacl
 else
+	poetry run ruff check ./"$(FilePath)"  #flake8
 	poetry run ruff check --select I ./"$(FilePath)" #isort
 	poetry run black --config=./pyproject.toml --check --verbose "$(FilePath)"
 endif

diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ usage: pyshacl [-h] [-s [SHACL]] [-e [ONT]] [-i {none,rdfs,owlrl,both}] [-m]
                [-ef {auto,turtle,xml,json-ld,nt,n3}] [-V] [-o [OUTPUT]]
                DataGraph
 
-PySHACL 0.23.0 command line tool.
+PySHACL 0.24.0 command line tool.
 
 positional arguments:
   DataGraph             The file containing the Target Data Graph.

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "pyshacl"
-version = "0.23.0"
+version = "0.24.0"
 # Don't forget to change the version number in __init__.py, Dockerfile, and CITATION.cff along with this one
 description = "Python SHACL Validator"
 license = "Apache-2.0"
@@ -145,7 +145,7 @@ exclude = '''
 [tool.ruff]
 # Enable pycodestyle (`E`) and Pyflakes (`F`) codes by default.
 select = ["E", "F"]
-ignore = []
+ignore = ["E501"]  # Turn off ruff's too-long-line detection for now, we'll have to enable it again later.
 
 # Allow autofix for all enabled rules (when `--fix`) is provided.
 fixable = ["A", "B", "C", "D", "E", "F", "G", "I", "N", "Q", "S", "T", "W", "ANN", "ARG", "BLE", "COM", "DJ", "DTZ", "EM", "ERA", "EXE", "FBT", "ICN", "INP", "ISC", "NPY", "PD", "PGH", "PIE", "PL", "PT", "PTH", "PYI", "RET", "RSE", "RUF", "SIM", "SLF", "TCH", "TID", "TRY", "UP", "YTT"]
@@ -191,6 +191,9 @@ target-version = "py37"
 # Unlike Flake8, default to a complexity level of 10.
 max-complexity = 10
 
+[tool.ruff.pycodestyle]
+ignore-overlong-task-comments = true
+
 [tool.pytest.ini_options]
 minversion = "6.0"
 testpaths = [
@@ -201,7 +204,7 @@ testpaths = [
 legacy_tox_ini = """
 [tox]
 skipsdist = true
-envlist = py37, py38, py39, py310, py311, lint, type-checking
+envlist = py38, py39, py310, py311, lint, type-checking
 toxworkdir={env:TOX_WORK_DIR:.tox}
 
 [testenv]

diff --git a/pyshacl/__init__.py b/pyshacl/__init__.py
@@ -5,7 +5,7 @@
 from .validate import Validator, validate
 
 # version compliant with https://www.python.org/dev/peps/pep-0440/
-__version__ = '0.23.0'
+__version__ = '0.24.0'
 # Don't forget to change the version number in pyproject.toml, Dockerfile, and CITATION.cff along with this one
 
 __all__ = ['validate', 'Validator', '__version__', 'Shape', 'ShapesGraph']
diff --git a/pyshacl/constraints/constraint_component.py b/pyshacl/constraints/constraint_component.py
@@ -391,7 +391,7 @@ def __new__(cls, shacl_graph: 'ShapesGraph', node):
                     break
                 if is_sparql_constraint_component:
                     raise ConstraintLoadError(
-                        "Found a mix of SPARQL-based validators and non-SPARQL validators on a SPARQLConstraintComponent.",
+                        "Found a mix of SPARQL-based validators and non-SPARQL validators on a SPARQLConstraintComponent.",  # noqa
                         'https://www.w3.org/TR/shacl/#constraint-components-validators',
                     )
                 elif is_js_constraint_component: