Merge pull request #453 from CLARIAH/dev

Preparing for release 1.3.9

Author: albertmeronyo

.dockerignore

@@ -0,0 +1,55 @@
+# SPDX-FileCopyrightText: 2022 Albert Meroño, Rinke Hoekstra, Carlos Martínez
+#
+# SPDX-License-Identifier: MIT
+
+*~
+\#*\#
+bin/
+!bin/grlc-server
+build/
+config.ini
+db-cache.json
+db.json
+DispatchSparqlQuery.ipynb
+docker-compose.yml
+Dockerfile2
+*/.DS_Store
+.eggs/
+FileLoaders.ipynb
+Get_Parameters.ipynb
+GetYamlDecorators.ipynb
+.git/
+.*!.gitignore
+grlc.egg-info/
+.idea
+include/
+ink_ext_XXXXXX_img0.png
+.ipynb_checkpoints/
+lib/
+local/
+*.log
+node_modules
+pip-selfcheck.json
+Process_sparql_query_text.ipynb
+*.pyc
+.pytest_cache
+.Python
+ReleaseProcedure.md
+response_1700168662326.html
+Rewrite_Query.ipynb
+share/
+src/config.ini
+src/FileLoaderTesting.ipynb
+ssl-certificates/
+!static/swagger-ui/dist/lib
+*.swp
+testQueries/
+TODOs.md
+TwitterAPIKeys.md
+venv3.10/
+venv3.11/
+venv3.8/
+venv3.9/
+venv-dev/
+venv-tests.sh
+.vscode/

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+per-file-ignores = 
+    src/__init__.py:F401
+    src/prov.py:E203
+    tests/test_grlc.py:F401

.github/workflows/linting.yml

@@ -0,0 +1,23 @@
+name: Lint
+
+on:
+  push:
+    paths:
+      - 'src/*.py'
+      - 'tests/*.py'
+jobs:
+  linter:
+    runs-on: ubuntu-latest
+    name: Lint
+    steps:
+      - name: Check out source repository
+        uses: actions/checkout@v3
+      - name: Set up Python environment
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+      - name: flake8 Lint
+        uses: py-actions/flake8@v2
+        with:
+          max-line-length: "127"
+          path: "src"

.github/workflows/publish_pypi.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v1
       with:
-        python-version: 3.7
+        python-version: 3.11
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

.github/workflows/testing.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9, 3.10.x, 3.11]
     steps:
     - uses: actions/checkout@master
     - name: Set up Python ${{ matrix.python-version }}

.gitignore

@@ -39,3 +39,4 @@ TODOs.md
 TwitterAPIKeys.md
 config.ini
 ink_ext_XXXXXX_img0.png
+build/

CITATION.cff

@@ -16,7 +16,7 @@ authors:
     given-names: Carlos
     orcid: "https://orcid.org/0000-0001-5565-7577"
 cff-version: "1.0.3"
-date-released: 2023-07-30
+date-released: 2024-02-17
 doi: 10.5281/zenodo.1064391
 license: MIT
 message: "If you use this software, please cite it as below."
@@ -29,4 +29,4 @@ keywords:
   - "linked-data"
   - "semantic-web"
   - "linked-data-api"
-version: "1.3.8"
+version: "1.3.9"

CONTRIBUTING.md

@@ -58,6 +58,7 @@ services:
      - USERMAP_GID=1000
      - USERMAP_UID=1000
      - GRLC_GITHUB_ACCESS_TOKEN=xxx
+     - GRLC_GITLAB_ACCESS_TOKEN=yyy
      - GRLC_SERVER_NAME=grlc.io
 ```
 

CONTRIBUTORS.md

@@ -23,3 +23,4 @@ This is a list of all people who have contributed to grlc. Big thanks to everyon
 [GenEars](https://github.com/GenEars)
 [nichtich](https://github.com/nichtich)
 [jblom](https://github.com/jblom)
+[abelsiqueira](https://github.com/abelsiqueira)

Dockerfile

@@ -2,15 +2,17 @@
 #
 # SPDX-License-Identifier: MIT
 
-FROM python:3.8.16
+FROM python:3.11-slim
 MAINTAINER [email protected]
 
 # Default values for env variables
 ARG GRLC_GITHUB_ACCESS_TOKEN=
+ARG GRLC_GITLAB_ACCESS_TOKEN=
 ARG GRLC_SERVER_NAME=grlc.io
 ARG GRLC_SPARQL_ENDPOINT=http://dbpedia.org/sparql
 
 ENV GRLC_GITHUB_ACCESS_TOKEN=$GRLC_GITHUB_ACCESS_TOKEN \
+    GRLC_GITLAB_ACCESS_TOKEN=$GRLC_GITLAB_ACCESS_TOKEN \
     GRLC_SERVER_NAME=$GRLC_SERVER_NAME \
     GRLC_SPARQL_ENDPOINT=$GRLC_SPARQL_ENDPOINT