From 74959187d79095fb91b36266634a74f228e6ec8f Mon Sep 17 00:00:00 2001 From: Sarah Date: Fri, 24 Mar 2023 09:27:17 +0100 Subject: [PATCH 1/2] GROUP BY, ORDER, MINUS Sparql keywords to be ignored by rewriter (#292) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * added as sparql clause * sparql keywords * group by sparql keywords ignored by rewriting * order keyword ignored when rewriting * added minus sparql keyword --------- Co-authored-by: Mouffok Sarah Co-authored-by: Cristina E. González-Espinoza --- kgforge/core/archetypes/store.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kgforge/core/archetypes/store.py b/kgforge/core/archetypes/store.py index ae26cb3d..c93ceee7 100644 --- a/kgforge/core/archetypes/store.py +++ b/kgforge/core/archetypes/store.py @@ -82,7 +82,11 @@ "isIRI", "isURI", "isBLANK", - "isLITERAL" + "isLITERAL", + "group", + "by", + "order", + "minus" ] From 16b49b198d9d0cf54e80d240df9ab1c724c6402f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristina=20E=2E=20Gonz=C3=A1lez-Espinoza?= Date: Mon, 27 Mar 2023 15:46:18 +0200 Subject: [PATCH 2/2] Upgrading to python 3.8 (#296) * Upgrading to python 3.9 * Changed to 3.8 instead --- .github/workflows/publish.yml | 4 ++-- .github/workflows/test.yml | 2 +- setup.py | 2 +- tox.ini | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index d919365f..c979cc4f 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,10 +11,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@master - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Build a source tarball run: python setup.py sdist - name: Publish distribution package to PyPI diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 73770aa7..bb186e18 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: - name: Install Python 3 uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies run: pip install .[dev] - name: Run tests with pytest diff --git a/setup.py b/setup.py index 0b7bb18b..fd9dcba3 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ keywords="framework knowledge graph data science", url="https://github.com/BlueBrain/nexus-forge", packages=find_packages(), - python_requires=">=3.7", + python_requires=">=3.8", setup_requires=[ "setuptools_scm", ], diff --git a/tox.ini b/tox.ini index 998d28f9..83623b4d 100644 --- a/tox.ini +++ b/tox.ini @@ -8,7 +8,7 @@ testdeps = [tox] envlist = lint - py{37,38} + py{38,39} indexserver = default = https://bbpteam.epfl.ch/repository/devpi/simple @@ -18,7 +18,7 @@ deps = {[base]testdeps} commands = pytest tests [testenv:lint] -basepython=python3.6 +basepython=python3.8 deps = pycodestyle pylint @@ -44,4 +44,4 @@ whitelist_externals = make # W504: line break before binary operator [pycodestyle] ignore = E731,W503,W504 -max-line-length = 100 +max-line-length = 200