Skip to content

Commit

Permalink
Added Python 3.10 support (when using RDFLib v6.1.1 or greater)
Browse files Browse the repository at this point in the history
Added more type hinting, to conform to the new type hinting added by RDFLib 6.1.1
Subtle correction in the way `sh:prefixs` works with `sh:declare` on the given named ontology.
Bumped some min versions of libraries, to gain compatibility with Python 3.10
Fixed test for issue #76
Fixed #76 again (after fixed test)
Bumped Version v0.18.0
  • Loading branch information
ashleysommer committed Jan 13, 2022
1 parent 8773c8c commit 0e1f643
Show file tree
Hide file tree
Showing 15 changed files with 378 additions and 259 deletions.
60 changes: 31 additions & 29 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ platform:
arch: amd64

steps:
- name: test
- name: test-3-7
image: python:3.7
environment:
TOX_WORK_DIR: /tmp/.tox
Expand All @@ -21,26 +21,6 @@ steps:
commands:
- pip3 install --upgrade tox
- tox -e py37
- name: type-checking
image: python:3.7
environment:
TOX_WORK_DIR: /tmp/.tox
volumes:
- name: tox_cache
path: /tmp/.tox
commands:
- pip3 install --upgrade tox
- tox -e type-checking
- name: lint
image: python:3.7
environment:
TOX_WORK_DIR: /tmp/.tox
volumes:
- name: tox_cache
path: /tmp/.tox
commands:
- pip3 install --upgrade tox
- tox -e lint

volumes:
- name: tox_cache
Expand All @@ -55,7 +35,7 @@ platform:
arch: amd64

steps:
- name: test
- name: test-3-8
image: python:3.8
environment:
TOX_WORK_DIR: /tmp/.tox
Expand All @@ -65,7 +45,7 @@ steps:
commands:
- pip3 install --upgrade tox
- tox -e py38
- name: type-checking
- name: type-checking-3-8
image: python:3.8
environment:
TOX_WORK_DIR: /tmp/.tox
Expand All @@ -75,7 +55,7 @@ steps:
commands:
- pip3 install --upgrade tox
- tox -e type-checking
- name: lint
- name: lint-3-8
image: python:3.8
environment:
TOX_WORK_DIR: /tmp/.tox
Expand Down Expand Up @@ -108,18 +88,40 @@ platform:
arch: amd64

steps:
- name: test
- name: test-3-9
image: python:3.9
environment:
TOX_WORK_DIR: /tmp/.tox
volumes:
- name: tox_cache
path: /tmp/.tox
commands:
- pip3 install -U "pip>=21.0"
- pip3 install --upgrade tox
- tox -e py39
- name: type-checking
image: python:3.9

---
kind: pipeline
name: python-3-10
type: docker
platform:
os: linux
arch: amd64

steps:
- name: test-3-10
image: python:3.10
environment:
TOX_WORK_DIR: /tmp/.tox
volumes:
- name: tox_cache
path: /tmp/.tox
commands:
- pip3 install -U "pip>=21.3"
- pip3 install --upgrade tox
- tox -e py310
- name: type-checking-3-10
image: python:3.10
environment:
TOX_WORK_DIR: /tmp/.tox
volumes:
Expand All @@ -128,8 +130,8 @@ steps:
commands:
- pip3 install --upgrade tox
- tox -e type-checking
- name: lint
image: python:3.9
- name: lint-3-10
image: python:3.10
environment:
TOX_WORK_DIR: /tmp/.tox
volumes:
Expand Down
33 changes: 24 additions & 9 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,45 +8,58 @@ and this project adheres to [Python PEP 440 Versioning](https://www.python.org/d

- Nothing yet

## [0.18.0] - 2022-01-13

## Added
- Added Python 3.10 support (when using RDFLib v6.1.1 or greater)
- Added more type hinting, to conform to the new type hinting added by RDFLib 6.1.1

## Changed
- Subtle correction in the way `sh:prefixs` works with `sh:declare` on the given named ontology.
- Bumped some min versions of libraries, to gain compatibility with Python 3.10

## Fixed
- Fixed test for issue #76
- Fixed #76 again (after fixed test)

## [0.17.3] - 2021-12-13

## Fixes
### Fixed
- Don't crash when a SHACL function is registered more than once (eg, if a function is both SPARQLFunction and JSFunction), fixes \#108, thanks Gabe Fierro
- Fixed typo in CLI help output, thanks Alex Nelson
- Don't print env vars when importing JS module, thanks MPolitze
- Fix typo preventing OWL-RL >=6.0 to be used with pySHACL, Fixes #111

## Added
### Added
- Add Snyk checks to CI/CD pipeline

## [0.17.2] - 2021-10-25

## Fixes
### Fixed
- SPARQL queries with words "values", "minus", or "service" in its comments no longer incorrectly throw an exception.

## Changed
### Changed
- Switched from Travis to Drone for CI testing

## Added
### Added
- New Table output type for commandline tool. Thanks @nicholascar


## [0.17.1] - 2021-10-11

## Fixes
### Fixed
- Handle transitive subclasses when evaluating sh:targetClass - @gtfierro
- Fixes #96
- Improve detection of RDF/XML files when loading unknown content
- Fixes #98
- Imported type stubs and resolved ALL MyPy issues! (this was a big effort)
- Logic fixes in the dataset loader (thanks to inconsistencies exposed by MyPy)

## Changed
### Changed
- Add special cases to sh:dataclass constraint, when the given shape uses rdfs:Literal or rdfs:Dataclass as the dataclass to match on
- Fixes #71

## Added
### Added
- Add datashapes.org/schema as a built-in graph
- Fixes #98
- Added ability to pass a TextIO or TextIOWrapper object into the dataset loader
Expand Down Expand Up @@ -875,7 +888,9 @@ 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.17.2...HEAD
[Unreleased]: https://github.com/RDFLib/pySHACL/compare/v0.18.0...HEAD
[0.18.0]: https://github.com/RDFLib/pySHACL/compare/v0.17.3...v0.18.0
[0.17.3]: https://github.com/RDFLib/pySHACL/compare/v0.17.2...v0.17.3
[0.17.2]: https://github.com/RDFLib/pySHACL/compare/v0.17.1...v0.17.2
[0.17.1]: https://github.com/RDFLib/pySHACL/compare/v0.17.0.post1...v0.17.1
[0.17.0.post1]: https://github.com/RDFLib/pySHACL/compare/v0.17.0...v0.17.0.post1
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ authors:
given-names: "Nicholas"
orcid: "http://orcid.org/0000-0002-8742-7730"
title: "pySHACL"
version: 0.17.3
version: 0.18.0
doi: 10.5281/zenodo.4750840
license: Apache-2.0
date-released: 2021-10-11
date-released: 2022-01-13
url: "https://github.com/RDFLib/pySHACL"
Loading

0 comments on commit 0e1f643

Please sign in to comment.