From e4acf54f92e2860d470f6d3f0c3956ce81b4c408 Mon Sep 17 00:00:00 2001 From: Mikko Nieminen Date: Wed, 30 Aug 2023 13:20:52 +0200 Subject: [PATCH] prepare v0.13.1 release (#1231) --- CHANGELOG.rst | 4 ++-- README.rst | 12 ++++++------ codemeta.json | 4 ++-- docs/source/app_projectroles_api_rest.rst | 2 +- docs/source/app_projectroles_integration.rst | 9 ++++----- docs/source/conf.py | 2 +- docs/source/getting_started.rst | 2 +- docs/source/major_changes.rst | 6 +++--- projectroles/management/commands/syncmodifyapi.py | 12 ++++-------- projectroles/views_api.py | 2 +- timeline/templates/timeline/timeline_site.html | 2 +- 11 files changed, 26 insertions(+), 31 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6512bdf7..34c78cdd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,8 +5,8 @@ Changelog for the **SODAR Core** Django app package. Loosely follows the `Keep a Changelog `_ guidelines. -Unreleased -========== +v0.13.1 (2023-08-30) +==================== Added ----- diff --git a/README.rst b/README.rst index 1c115704..8dbcbc62 100644 --- a/README.rst +++ b/README.rst @@ -115,7 +115,7 @@ and breaking changes are possible. .. code-block:: console - pip install django-sodar-core==0.13.0 + pip install django-sodar-core==0.13.1 For installing a development version you can point your dependency to a specific commit ID in GitHub. Note that these versions may not be stable. @@ -135,12 +135,12 @@ Repository The branches of the SODAR Core repository are organized as follows: -- ``main``: The latest stable release. -- ``dev``: The current development branch. Most recent features go here, but - stability is not guaranteed. +``main`` + The latest stable release. +``dev`` + The current development branch. Most recent features go here, but stability + is not guaranteed. Pull requests should always be based on this branch. When including SODAR Core in your Django project, it is highly recommended to freeze your dependency to a specific release tag or commit ID. The project is under development and breaking changes may be introduced frequently. - -Contributions should always be based on the ``dev`` branch. diff --git a/codemeta.json b/codemeta.json index 9c023255..0e7c1972 100644 --- a/codemeta.json +++ b/codemeta.json @@ -40,8 +40,8 @@ ], "identifier": "https://doi.org/10.5281/zenodo.4269346", "codeRepository": "https://github.com/bihealth/sodar-core", - "datePublished": "2023-06-01", - "dateModified": "2023-06-01", + "datePublished": "2023-08-30", + "dateModified": "2023-08-30", "dateCreated": "2019-06-26", "description": "SODAR Core: A Django-based framework for scientific data management and analysis web apps", "keywords": "Python, Django, scientific data managmenent, software library", diff --git a/docs/source/app_projectroles_api_rest.rst b/docs/source/app_projectroles_api_rest.rst index 99ced98a..011727fd 100644 --- a/docs/source/app_projectroles_api_rest.rst +++ b/docs/source/app_projectroles_api_rest.rst @@ -44,7 +44,7 @@ expected version. .. code-block:: console - Accept: application/vnd.bihealth.sodar-core+json; version=0.9.1 + Accept: application/vnd.bihealth.sodar-core+json; version=0.13.1 .. note:: diff --git a/docs/source/app_projectroles_integration.rst b/docs/source/app_projectroles_integration.rst index 2a6c799a..fb38b438 100644 --- a/docs/source/app_projectroles_integration.rst +++ b/docs/source/app_projectroles_integration.rst @@ -79,14 +79,13 @@ chapter. `1.11 release of cookiecutter-django `_. Some details such as directory structures and settings variables may differ. -First, add the ``django-plugins`` and ``django-sodar-core`` package requirements -into your ``requirements/base.txt`` file. Make sure you are pointing to the -desired release tag or commit ID. +First, add the ``django-sodar-core`` dependency into your +``requirements/base.txt`` file. Make sure you are pointing to the desired +release tag or commit ID. .. code-block:: console - -e git+https://github.com/mikkonie/django-plugins.git@42e86e7904e5c09f1da32173862b26843eda5dd8#egg=django-plugins - django-sodar-core==0.13.0 + django-sodar-core==0.13.1 Install the requirements for development: diff --git a/docs/source/conf.py b/docs/source/conf.py index e5b6d6d5..dd3bedc0 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -29,7 +29,7 @@ # The short X.Y version version = '0.13' # The full version, including alpha/beta/rc tags -release = '0.13.1-WIP' +release = '0.13.1' # -- General configuration --------------------------------------------------- diff --git a/docs/source/getting_started.rst b/docs/source/getting_started.rst index 93e86d18..87fa4bf8 100644 --- a/docs/source/getting_started.rst +++ b/docs/source/getting_started.rst @@ -17,7 +17,7 @@ the package is under active development and breaking changes are expected. .. code-block:: console - pip install django-sodar-core==0.13.0 + pip install django-sodar-core==0.13.1 Please note that the django-sodar-core package only installs :term:`Django apps`, which you need to include in a diff --git a/docs/source/major_changes.rst b/docs/source/major_changes.rst index 7c2a4d4a..93e94d77 100644 --- a/docs/source/major_changes.rst +++ b/docs/source/major_changes.rst @@ -10,13 +10,13 @@ older SODAR Core version. For a complete list of changes in current and previous releases, see the :ref:`full changelog`. -v0.13.1 (WIP) -************* +v0.13.1 (2023-08-30) +******************** Release Highlights ================== -- Improve member invite view +- Improve member invite views - Improve syncmodifyapi management command - Revise tour help - General bug fixes and minor updates diff --git a/projectroles/management/commands/syncmodifyapi.py b/projectroles/management/commands/syncmodifyapi.py index 5fa36017..5c663d66 100644 --- a/projectroles/management/commands/syncmodifyapi.py +++ b/projectroles/management/commands/syncmodifyapi.py @@ -1,6 +1,6 @@ """ Syncmodifyapi management command for synchronizing existing projects using the -project modify API +project modify API. """ import sys @@ -39,7 +39,7 @@ def handle(self, *args, **options): project_uuid = options.get('project') if project_uuid: logger.info( - 'Synchronizing project with UUID "{}"..'.format(project_uuid) + 'Limiting sync to project with UUID "{}"..'.format(project_uuid) ) project = Project.objects.filter(sodar_uuid=project_uuid).first() if not project: @@ -56,16 +56,12 @@ def handle(self, *args, **options): err_count = 0 for p in project_list: p_title = p.get_log_title(full_title=True) - logger.debug('Synchronizing project: {}'.format(p_title)) + logger.debug('Synchronizing project {}'.format(p_title)) try: self.call_project_modify_api('perform_project_sync', None, [p]) sync_count += 1 except Exception as ex: - logger.error( - 'Exception in project sync for project {}: {}'.format( - p_title, ex - ) - ) + logger.error('Exception for project {}: {}'.format(p_title, ex)) err_count += 1 logger.info( 'Project data synchronized ({} OK, {} error{})'.format( diff --git a/projectroles/views_api.py b/projectroles/views_api.py index 35c51ecf..c5b7ce27 100644 --- a/projectroles/views_api.py +++ b/projectroles/views_api.py @@ -98,7 +98,7 @@ CORE_API_DEFAULT_VERSION = re.match( r'^([0-9.]+)(?:[+|\-][\S]+)?$', core_version )[1] -CORE_API_ALLOWED_VERSIONS = ['0.13.0'] +CORE_API_ALLOWED_VERSIONS = ['0.13.0', '0.13.1'] # Local constants INVALID_PROJECT_TYPE_MSG = ( diff --git a/timeline/templates/timeline/timeline_site.html b/timeline/templates/timeline/timeline_site.html index 4afb37a4..88e54fab 100644 --- a/timeline/templates/timeline/timeline_site.html +++ b/timeline/templates/timeline/timeline_site.html @@ -58,7 +58,7 @@

{% else %} No {% if timeline_mode == 'site' %}site-wide{% endif %} timeline - events found {% if timeline_mode == 'object' %}for this object{% endif %}. + events found{% if timeline_mode == 'object' %} for this object{% endif %}. {% endif %}