From 5a03b4a9a40ec5d21bf5773a1ee4d686880bce80 Mon Sep 17 00:00:00 2001 From: Mikko Nieminen Date: Thu, 12 Sep 2024 09:05:09 +0200 Subject: [PATCH] cleanup and prepare v0.15.1 release (#1985, #1995) --- CHANGELOG.rst | 6 ++++-- config/settings/base.py | 3 ++- docs_manual/source/api_documentation.rst | 2 +- docs_manual/source/api_examples.rst | 2 +- docs_manual/source/api_irodsinfo.rst | 2 +- docs_manual/source/api_landingzones.rst | 2 +- docs_manual/source/api_samplesheets.rst | 2 +- docs_manual/source/conf.py | 2 +- docs_manual/source/sodar_release_notes.rst | 4 ++-- landingzones/static/landingzones/js/landingzones.js | 3 ++- landingzones/tests/test_ui.py | 6 ------ samplesheets/vueapp/package-lock.json | 10 +++++----- samplesheets/vueapp/package.json | 2 +- 13 files changed, 22 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index abbd3658..e671b553 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,8 +5,8 @@ Changelog for the SODAR project. Loosely follows the `Keep a Changelog `_ guidelines. -Unreleased -========== +v0.15.1 (2024-09-12) +==================== Changed ------- @@ -17,6 +17,8 @@ Changed Fixed ----- +- **Landingzones** + - Invalid CSS classes set by zone status update (#1995) - **Samplesheets** - ``generic`` assay plugin inline links pointing to ``ResultsReports`` (#1982) - ``generic`` assay plugin cache update crash with row path built from ontology column (#1984) diff --git a/config/settings/base.py b/config/settings/base.py index 940142d9..02694f2b 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -611,7 +611,7 @@ def set_logging(level=None): # General API settings -SODAR_API_DEFAULT_VERSION = '0.15.0' +SODAR_API_DEFAULT_VERSION = '0.15.1' SODAR_API_ALLOWED_VERSIONS = [ '0.7.0', '0.7.1', @@ -634,6 +634,7 @@ def set_logging(level=None): '0.14.1', '0.14.2', '0.15.0', + '0.15.1', ] SODAR_API_MEDIA_TYPE = 'application/vnd.bihealth.sodar+json' SODAR_API_DEFAULT_HOST = env.url( diff --git a/docs_manual/source/api_documentation.rst b/docs_manual/source/api_documentation.rst index d3a24676..958920d9 100644 --- a/docs_manual/source/api_documentation.rst +++ b/docs_manual/source/api_documentation.rst @@ -45,7 +45,7 @@ expected version. .. code-block:: console - Accept: application/vnd.bihealth.sodar+json; version=0.15.0 + Accept: application/vnd.bihealth.sodar+json; version=0.15.1 Specific sections of the SODAR API may require their own accept header. See the exact header requirement in the respective documentation on each section of the diff --git a/docs_manual/source/api_examples.rst b/docs_manual/source/api_examples.rst index 54417255..15b32fc6 100644 --- a/docs_manual/source/api_examples.rst +++ b/docs_manual/source/api_examples.rst @@ -43,7 +43,7 @@ the SODAR API: # Use core_headers for project management API endpoints core_headers = {**auth_header, 'Accept': 'application/vnd.bihealth.sodar-core+json; version=0.13.4'} # Use sodar_headers for sample sheet and landing zone API endpoints - sodar_headers = {**auth_header, 'Accept': 'application/vnd.bihealth.sodar+json; version=0.15.0'} + sodar_headers = {**auth_header, 'Accept': 'application/vnd.bihealth.sodar+json; version=0.15.1'} .. note:: diff --git a/docs_manual/source/api_irodsinfo.rst b/docs_manual/source/api_irodsinfo.rst index 19148d43..355c6f82 100644 --- a/docs_manual/source/api_irodsinfo.rst +++ b/docs_manual/source/api_irodsinfo.rst @@ -22,4 +22,4 @@ SODAR version: .. code-block:: console - Accept: application/vnd.bihealth.sodar+json; version=0.15.0 + Accept: application/vnd.bihealth.sodar+json; version=0.15.1 diff --git a/docs_manual/source/api_landingzones.rst b/docs_manual/source/api_landingzones.rst index de1f53eb..0167fdd8 100644 --- a/docs_manual/source/api_landingzones.rst +++ b/docs_manual/source/api_landingzones.rst @@ -32,4 +32,4 @@ SODAR version: .. code-block:: console - Accept: application/vnd.bihealth.sodar+json; version=0.15.0 + Accept: application/vnd.bihealth.sodar+json; version=0.15.1 diff --git a/docs_manual/source/api_samplesheets.rst b/docs_manual/source/api_samplesheets.rst index b97d8cbf..bbcceb8d 100644 --- a/docs_manual/source/api_samplesheets.rst +++ b/docs_manual/source/api_samplesheets.rst @@ -68,4 +68,4 @@ SODAR version: .. code-block:: console - Accept: application/vnd.bihealth.sodar+json; version=0.15.0 + Accept: application/vnd.bihealth.sodar+json; version=0.15.1 diff --git a/docs_manual/source/conf.py b/docs_manual/source/conf.py index be389ec6..8559785a 100644 --- a/docs_manual/source/conf.py +++ b/docs_manual/source/conf.py @@ -26,7 +26,7 @@ author = 'BIH Core Unit Bioinformatics' # The full version, including alpha/beta/rc tags -release = '0.15.1-WIP' +release = '0.15.1' # -- General configuration --------------------------------------------------- diff --git a/docs_manual/source/sodar_release_notes.rst b/docs_manual/source/sodar_release_notes.rst index 4a090c85..e7fe6994 100644 --- a/docs_manual/source/sodar_release_notes.rst +++ b/docs_manual/source/sodar_release_notes.rst @@ -8,8 +8,8 @@ list of changes in current and previous releases, see the :ref:`full changelog`. -v0.15.1 (WIP) -============= +v0.15.1 (2024-09-12) +==================== Release for minor updates, maintenance and bug fixes. diff --git a/landingzones/static/landingzones/js/landingzones.js b/landingzones/static/landingzones/js/landingzones.js index 371c5f8c..6a3a1e52 100644 --- a/landingzones/static/landingzones/js/landingzones.js +++ b/landingzones/static/landingzones/js/landingzones.js @@ -51,7 +51,8 @@ var updateZoneStatus = function() { ) { statusTd.text(zoneStatus); statusTd.removeClass(); - statusTd.addClass(statusStyles[zoneStatus] + ' text-white'); + statusTd.addClass( + 'sodar-lz-zone-status ' + statusStyles[zoneStatus] + ' text-white'); statusInfoSpan.text(zoneStatusInfo); if (['PREPARING', 'VALIDATING', 'MOVING', 'DELETING'].includes(zoneStatus)) { statusTd.append( diff --git a/landingzones/tests/test_ui.py b/landingzones/tests/test_ui.py index a1bbb719..9925feb2 100644 --- a/landingzones/tests/test_ui.py +++ b/landingzones/tests/test_ui.py @@ -378,12 +378,6 @@ def test_stats_deleted_superuser(self): ) self.login_and_redirect(self.superuser, self.url) - # NOTE: Attempt to fix #1995 - WebDriverWait(self.selenium, self.wait_time).until( - ec.presence_of_element_located( - (By.CLASS_NAME, 'sodar-lz-zone-status') - ) - ) zone_status = self.selenium.find_element( By.CLASS_NAME, 'sodar-lz-zone-status' ) diff --git a/samplesheets/vueapp/package-lock.json b/samplesheets/vueapp/package-lock.json index 5d6100a1..da69140a 100644 --- a/samplesheets/vueapp/package-lock.json +++ b/samplesheets/vueapp/package-lock.json @@ -1,12 +1,12 @@ { "name": "samplesheets", - "version": "0.15.1-WIP", + "version": "0.15.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "samplesheets", - "version": "0.15.1-WIP", + "version": "0.15.1", "dependencies": { "bootstrap-vue": "^2.22.0", "core-js": "^3.23.5", @@ -5506,9 +5506,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001651", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", - "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", + "version": "1.0.30001660", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001660.tgz", + "integrity": "sha512-GacvNTTuATm26qC74pt+ad1fW15mlQ/zuTzzY1ZoIzECTP8HURDfF43kNxPgf7H1jmelCBQTTbBNxdSXOA7Bqg==", "dev": true, "funding": [ { diff --git a/samplesheets/vueapp/package.json b/samplesheets/vueapp/package.json index c069a6bf..1acb3387 100644 --- a/samplesheets/vueapp/package.json +++ b/samplesheets/vueapp/package.json @@ -1,6 +1,6 @@ { "name": "samplesheets", - "version": "0.15.1-WIP", + "version": "0.15.1", "private": true, "scripts": { "serve": "vue-cli-service serve",