Merge branch 'develop'

* develop:
  Update version for release of 1.3.0
  Bump Waitress to 2.1.2
  Limit requirements for a functioning atramhasis. (#750)
  Switch development to 1.3.0
  Update badge
  Set develop branch to version 2.0.0
  Upgrade skosprovider_rdf. (#742)
  Only build paper on joss_paper branch.
  Rename action.
  Create draft-pdf.yml.yml
  Trying to fix Scrutinizer. Refs #677
  Trying to fix Scrutinizer. Refs #677
  Trying to fix Scrutinizer. Refs #677
  Trying to fix Scrutinizer. Refs #677
  Fix python version in setup.py
  Update Travis link.

.github/workflows/draft-pdf.yml

@@ -0,0 +1,26 @@
+on: 
+  push:
+    branches:
+      - joss_paper
+
+jobs:
+  paper:
+    runs-on: ubuntu-latest
+    name: Paper Draft
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Build draft PDF
+        uses: openjournals/openjournals-draft-action@master
+        with:
+          journal: joss
+          # This should be the path to the paper within your repo.
+          paper-path: ./paper/paper.md
+      - name: Upload
+        uses: actions/upload-artifact@v1
+        with:
+          name: paper
+          # This is the output path where Pandoc will write the compiled
+          # PDF. Note, this should be the same directory as the input
+          # paper.md
+          path: ./paper/paper.pdf

.scrutinizer.yml

@@ -1,8 +1,15 @@
 checks:
-    python:
-        code_rating: true
-        duplicate_code: true
+  python:
+    code_rating: true
+    duplicate_code: true
+
+build:
+  nodes:
+    analysis:
+      tests:
+        override:
+          - py-scrutinizer-run
 
 filter:
-    excluded_paths:
-        - 'tests/*'
+  excluded_paths:
+    - 'tests/*'

CHANGES.rst

@@ -1,3 +1,11 @@
+1.3.0 (04-01-2023)
+-------------------
+
+- Fix some dependencies to avoid broken dependencies (#749)
+- Remove Waitress from setup.py since this it's not necessary to run in production with Waitress (#749)
+- Update skosprovider_rdf to version 1.3.0 to avoid accidentally 
+  exposing URI's as dcterms:identifier. (#741)
+
 1.2.0 (19-10-2022)
 ------------------
 

CITATION.cff

@@ -81,5 +81,5 @@ keywords:
   - vocabulary
   - python
 license: GPL-3.0
-version: 1.2.0
-date-released: '2022-10-19'
+version: 1.3.0
+date-released: '2023-01-04'

README.rst

@@ -7,12 +7,12 @@ Atramhasis
         :target: http://atramhasis.readthedocs.io/en/latest/?badge=latest
 .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.5801135.svg
         :target: https://doi.org/10.5281/zenodo.5801135
-.. image:: https://travis-ci.org/OnroerendErfgoed/atramhasis.png?branch=master
-        :target: https://travis-ci.org/OnroerendErfgoed/atramhasis?branch=master
-.. image:: https://coveralls.io/repos/github/OnroerendErfgoed/atramhasis/badge.svg?branch=master
-        :target: https://coveralls.io/github/OnroerendErfgoed/atramhasis?branch=master
-.. image:: https://scrutinizer-ci.com/g/onroerenderfgoed/atramhasis/badges/quality-score.png?b=master
-        :target: https://scrutinizer-ci.com/g/onroerenderfgoed/atramhasis/?branch=master
+.. image:: https://app.travis-ci.com/OnroerendErfgoed/atramhasis.svg?branch=develop
+        :target: https://app.travis-ci.com/OnroerendErfgoed/atramhasis 
+.. image:: https://coveralls.io/repos/github/OnroerendErfgoed/atramhasis/badge.svg?branch=develop
+        :target: https://coveralls.io/github/OnroerendErfgoed/atramhasis?branch=develop
+.. image:: https://scrutinizer-ci.com/g/OnroerendErfgoed/atramhasis/badges/quality-score.png?b=develop
+        :target: https://scrutinizer-ci.com/g/OnroerendErfgoed/atramhasis/?branch=develop
 
 Atramhasis is an online SKOS editor. This webapplication enables
 users to create SKOS vocabularies consisting of Concepts and Collections. It 

atramhasis/openapi.yaml

@@ -2,7 +2,7 @@ openapi: 3.0.3
 
 info:
   title: Atramhasis API
-  version: 1.1.0
+  version: 1.3.0
 
 servers:
   - url: '/'

atramhasis/static/admin/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "atramhasis",
-	"version": "1.1.0",
+	"version": "1.3.0",
 	"description": "Node packages for building Atramhasis.",
 	"repository": {
 		"type": "git",

atramhasis/static/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "atramhasis",
-	"version": "1.1.0",
+	"version": "1.3.0",
 	"description": "Node packages for public part of Atramhasis.",
 	"repository": {
 		"type": "git",

docs/source/conf.py

@@ -49,16 +49,16 @@
 
 # General information about the project.
 project = 'Atramhasis'
-copyright = '2014-2021, Flanders Heritage Agency'
+copyright = '2014-2023, Flanders Heritage Agency'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '1.3'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.0'
+release = '1.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

requirements-dev-base.txt

@@ -17,7 +17,7 @@ sphinxcontrib-httpdomain==1.8.0
 pygments==2.10.0
 
 # waitress
-waitress==2.0.0
+waitress==2.1.2
 
 # Linting
 flake8==4.0.1

requirements.txt

@@ -2,15 +2,14 @@
 pyramid==2.0
 pyramid-tm==2.4
 pyramid_rewrite==0.2
-openapi-core==0.13.8 # newer version incompatible with pyramid_openapi3==0.13
-pyramid_openapi3==0.13
-openapi-spec-validator==0.4.0
+pyramid_openapi3==0.14.3
+openapi-spec-validator==0.4.0  # https://github.com/p1c2u/openapi-core/issues/442
 
 # skosprovider
 skosprovider==1.2.0
 skosprovider_sqlalchemy==1.0.0
 pyramid_skosprovider==1.1.0
-skosprovider_rdf==1.2.0
+skosprovider_rdf==1.3.0
 skosprovider_getty==1.1.0
 
 language-tags==1.1.0
@@ -21,7 +20,8 @@ zope.sqlalchemy==1.6
 transaction==3.0.1
 
 # jinja2
-jinja2==3.0.3
+jinja2==2.11.3
+markupsafe==2.0.1  # necessary for <3 jinja2 versions
 pyramid-jinja2==2.8
 Babel==2.9.1
 

setup.py

@@ -44,18 +44,19 @@ def run(self):
 requires = [
     'pyramid',
     'pyramid_tm',
-    'SQLAlchemy',
+    'SQLAlchemy<2.0.0',
     'transaction',
     'zope.sqlalchemy',
-    'waitress',
     'skosprovider',
-    'skosprovider_sqlalchemy',
+    'skosprovider_sqlalchemy<2.0.0',
     'skosprovider_rdf',
     'skosprovider_getty',
     'pyramid_skosprovider',
     'pyramid_openapi3',
+    'openapi-spec-validator==0.4.0',  # https://github.com/p1c2u/openapi-core/issues/442
     'language_tags',
-    'jinja2',
+    'jinja2 < 3.0.0',
+    'markupsafe==2.0.1',  # necessary for <3 jinja2 versions
     'pyramid_jinja2',
     'alembic',
     'babel',
@@ -70,20 +71,20 @@ def run(self):
 ]
 
 setup(name='atramhasis',
-      version='1.2.0',
+      version='1.3.0',
       description='A web based editor for thesauri adhering to the SKOS specification.',
       long_description=README + '\n\n' + CHANGES,
       long_description_content_type='text/x-rst',
       classifiers=[
-          "Development Status :: 4 - Beta",
+          "Development Status :: 5 - Production/Stable",
           "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
           "Programming Language :: Python",
           "Framework :: Pyramid",
           "Topic :: Internet :: WWW/HTTP",
           "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
-          "Programming Language :: Python :: 3.6",
-          "Programming Language :: Python :: 3.7",
-          "Programming Language :: Python :: 3.8"
+          "Programming Language :: Python :: 3.8",
+          "Programming Language :: Python :: 3.9",
+          "Programming Language :: Python :: 3.10",
       ],
       author='Flanders Heritage Agency',
       author_email='ict@onroerenderfgoed.be',

tox.ini

@@ -1,8 +1,8 @@
 [tox]
-envlist =py36, p37, py38, py39, cover
+envlist = py38, py39, py310, cover
 
 [testenv]
-passenv = 3.6
+passenv = 3.8
 commands =
 	pip install -r requirements-dev.txt
 	python setup.py develop
@@ -15,7 +15,7 @@ deps =
 
 [testenv:cover]
 basepython =
-	python3.6.0
+	python3.8.0
 commands = 
 	pip install -U setuptools
         pip install -r requirements-dev.txt