[neon-notifications] Changes in repo-metadata

Neon CI noreply at kde.org
Wed Apr 24 19:46:23 BST 2024 

commit 79e3f7a47166bdea80aaa6d1e4b54b6579a38d1e
Author: Volker Krause <vkrause at kde.org>
Date:   Wed Apr 24 17:05:39 2024 +0200

    Switch poxml to KF6

diff --git a/dependencies/logical-module-structure.json b/dependencies/logical-module-structure.json
index 59cb95be..8eb0ba73 100644
--- a/dependencies/logical-module-structure.json
+++ b/dependencies/logical-module-structure.json
@@ -359,8 +359,8 @@
             "stable-kf5-qt5": "release/24.05"
         },
         "kde/kdesdk/poxml" : {
-            "kf6-qt6": "",
-            "kf5-qt5": "master",
+            "kf6-qt6": "master",
+            "kf5-qt5": "",
             "stable-kf6-qt6": "",
             "stable-kf5-qt5": "release/24.05"
         },
diff --git a/projects-invent/sdk/poxml/i18n.json b/projects-invent/sdk/poxml/i18n.json
index 0586670f..f7f45733 100644
--- a/projects-invent/sdk/poxml/i18n.json
+++ b/projects-invent/sdk/poxml/i18n.json
@@ -1 +1 @@
-{"trunk": "none", "stable": "none", "stable_kf5": "release/24.05", "trunk_kf5": "master"}
+{"trunk": "none", "stable": "none", "stable_kf5": "release/24.05", "trunk_kf5": "none", "stable_kf6": "none", "trunk_kf6": "master"}

commit 913b51863a86c4b241a78d5305aef4e2d67d401c
Author: Friedrich W. H. Kossebau <kossebau at kde.org>
Date:   Tue Apr 23 13:26:49 2024 +0200

    branch-rules.yml: kgraphviewer kf6-stable is 2.5 now, no more kf5 branches
    
    Using tags instead of branch names is currently not supported.
    
    Just, the last kf5 releases of kgraphviewer have been from master branch,
    which is now KF6-only.
    The only other project depending on kgraphviewer is massif-visualizer,
    whose last stable kf5 branch does not even have ci setup.
    
    So just removing the entries for @latest & @stable (doable also as there
    is no graphics/* glob), which in case someone tries to acquire those
    old variants the error seen should be as early as possible and be clear.

diff --git a/branch-rules.yml b/branch-rules.yml
index 8e742fd3..c5991bb0 100644
--- a/branch-rules.yml
+++ b/branch-rules.yml
@@ -28,7 +28,6 @@
   'graphics/libkipi': 'master'
   'graphics/libkdcraw': 'master'
   'graphics/libksane': 'master'
-  'graphics/kgraphviewer': 'master'
   'graphics/kdegraphics-mobipocket': 'master'
   'graphics/okular': 'release/23.08'
   'kdevelop/*': 'master'
@@ -193,7 +192,6 @@
   'graphics/libkipi': 'release/24.02'
   'graphics/libksane': 'release/23.08'
   'graphics/libkexiv2': 'release/23.08'
-  'graphics/kgraphviewer': 'master'
   'graphics/kdegraphics-mobipocket': 'release/23.08'
   'graphics/kdiagram': '2.8'
   'graphics/okular': 'release/23.08'
@@ -305,7 +303,7 @@
   'graphics/libkipi': 'release/24.02'
   'graphics/libkdcraw': 'release/24.02'
   'graphics/libksane': 'release/24.02'
-  'graphics/kgraphviewer': 'master'
+  'graphics/kgraphviewer': '2.5'
   'graphics/kdegraphics-mobipocket': 'release/24.02'
   'kdevelop/*': 'release/24.02'
   'multimedia/libkcddb': 'release/24.02'

commit e340f51d328c5eb6aff03248d54e98266ace54b1
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Apr 23 22:49:06 2024 +0200

    move kdeedu-data to KF6 in the i18n sense
    
    Even though it doesn-t have any

diff --git a/projects-invent/education/kdeedu-data/i18n.json b/projects-invent/education/kdeedu-data/i18n.json
index a21636fd..511192c0 100644
--- a/projects-invent/education/kdeedu-data/i18n.json
+++ b/projects-invent/education/kdeedu-data/i18n.json
@@ -1 +1 @@
-{"trunk_kf5": "master", "stable_kf5": "release/24.05"}
+{"trunk_kf6": "master", "stable_kf5": "release/24.05"}

commit a0e6c7fc42787d799a4470bcb1c086176c2c0b5c
Author: Albert Astals Cid <aacid at kde.org>
Date:   Tue Apr 23 22:47:38 2024 +0200

    Stop special casing kdeedu-data
    
    There's no more KF5 users of it so we can just let it fall in the
    regular KF6 catch all of kde/*

diff --git a/dependencies/logical-module-structure.json b/dependencies/logical-module-structure.json
index 47500de2..59cb95be 100644
--- a/dependencies/logical-module-structure.json
+++ b/dependencies/logical-module-structure.json
@@ -128,12 +128,6 @@
             "stable-kf6-qt6": "release/24.05",
             "stable-kf5-qt5": "release/24.05"
         },
-        "kde/kdeedu/kdeedu-data" : {
-            "kf6-qt6": "master",
-            "kf5-qt5": "master",
-            "stable-kf6-qt6": "release/24.05",
-            "stable-kf5-qt5": "release/24.05"
-        },
         "kde/kdegraphics/kdegraphics-thumbnailers" : {
             "kf6-qt6": "master",
             "kf5-qt5": "master",

commit cdce900226c352f7361b5cbb77b4a21da82acda0
Author: Ingo Klöcker <dev at ingo-kloecker.de>
Date:   Tue Apr 23 17:30:31 2024 +0200

    Remove duplicate entry

diff --git a/branch-rules.yml b/branch-rules.yml
index 08545816..8e742fd3 100644
--- a/branch-rules.yml
+++ b/branch-rules.yml
@@ -268,7 +268,6 @@
   'plasma/powerdevil': 'Plasma/5.27'
   'plasma/plasma-nano': 'Plasma/5.27'
   'plasma/systemsettings': 'Plasma/5.27'
-  'plasma/plasma-workspace': 'Plasma/5.27'
   'sdk/libkomparediff2': 'release/23.08'
   'sdk/kdiff3': '1.11'
   'system/dolphin': 'release/23.08'

commit 3af217444fa92236f1aa986020493fb3274887fd
Author: Ingo Klöcker <dev at ingo-kloecker.de>
Date:   Tue Apr 23 17:14:38 2024 +0200

    Lint YAML files

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 239dfb6a..43a6533b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@ include:
   - project: sysadmin/ci-utilities
     file:
       - /gitlab-templates/json-validation.yml
+      - /gitlab-templates/yaml-lint.yml
 
 .python:
   stage: test
diff --git a/.yamllint.yaml b/.yamllint.yaml
new file mode 100644
index 00000000..a9715094
--- /dev/null
+++ b/.yamllint.yaml
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: CC0-1.0
+# SPDX-FileCopyrightText: 2023 KDE e.V.
+
+extends: default
+
+rules:
+  comments:
+    # require only one space to separate content from comment marker
+    min-spaces-from-content: 1
+  document-start: disable
+  indentation:
+    indent-sequences: whatever
+  line-length: disable
diff --git a/projects-invent/graphics/digikam-test-data/metadata.yaml b/projects-invent/graphics/digikam-test-data/metadata.yaml
index 3a5ebec4..0dac57f8 100644
--- a/projects-invent/graphics/digikam-test-data/metadata.yaml
+++ b/projects-invent/graphics/digikam-test-data/metadata.yaml
@@ -1,4 +1,4 @@
-description: Data required to support running unit tests for digiKam 
+description: Data required to support running unit tests for digiKam
 hasrepo: true
 identifier: digikam-test-data
 name: digiKam Test Data
diff --git a/projects-invent/office/klevernotes/metadata.yaml b/projects-invent/office/klevernotes/metadata.yaml
index 6c99a4a6..e8f2152f 100644
--- a/projects-invent/office/klevernotes/metadata.yaml
+++ b/projects-invent/office/klevernotes/metadata.yaml
@@ -1,4 +1,4 @@
-description: A note-taking and management application using markdown. 
+description: A note-taking and management application using markdown.
 hasrepo: true
 identifier: klevernotes
 name: KleverNotes
diff --git a/projects-invent/pim/akonadi-search/metadata.yaml b/projects-invent/pim/akonadi-search/metadata.yaml
index 268f1c67..adcda5e9 100644
--- a/projects-invent/pim/akonadi-search/metadata.yaml
+++ b/projects-invent/pim/akonadi-search/metadata.yaml
@@ -1,4 +1,3 @@
-
 bugzilla:
   product: akonadi
   component: indexer
diff --git a/projects-invent/sysadmin/ci-service-templates/metadata.yaml b/projects-invent/sysadmin/ci-service-templates/metadata.yaml
index 4ff8b048..9cf5a178 100644
--- a/projects-invent/sysadmin/ci-service-templates/metadata.yaml
+++ b/projects-invent/sysadmin/ci-service-templates/metadata.yaml
@@ -1,7 +1,7 @@
 description: Gitlab CI templates for use with Micro Services
 hasrepo: true
 identifier: sysadmin-ci-service-templates
-name: CI Templates Go and Ruby Micro Services 
+name: CI Templates Go and Ruby Micro Services
 projectpath: sysadmin/ci-service-templates
 repoactive: false
 repopath: sysadmin/ci-service-templates

commit 2a5f265d9f87520bbddeae6d9c324f5b9deb2c25
Author: Ingo Klöcker <dev at ingo-kloecker.de>
Date:   Tue Apr 23 17:10:04 2024 +0200

    Use base job for Python jobs instead of setting global defaults

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8e58e862..239dfb6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,25 +3,24 @@ include:
     file:
       - /gitlab-templates/json-validation.yml
 
-image: python:latest
-
-before_script:
-  - pip install virtualenv
-  - virtualenv venv
-  - source venv/bin/activate
-  - pip3 install -r requirements.txt
-
-check:
+.python:
   stage: test
+  image: python:latest
   tags:
     - Linux
+  before_script:
+    - pip install virtualenv
+    - virtualenv venv
+    - source venv/bin/activate
+    - pip3 install -r requirements.txt
+
+check:
+  extends: .python
   script:
     - python3 verify-repo-metadata.py --metadata-path projects-invent
 
 lint:
-  stage: test
-  tags:
-    - Linux
+  extends: .python
   script:
     - pip3 install pylint mypy networkx types-PyYAML types-regex
     - FILES="*.py git-helpers/* dependencies/tools/*"

commit 274da5157d51b09dc50217f176920d560a9dda58
Author: Ingo Klöcker <dev at ingo-kloecker.de>
Date:   Tue Apr 23 17:07:23 2024 +0200

    Remove cache settings
    
    Caching is disabled so that the settings are useless.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d5db106c..8e58e862 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,21 +5,6 @@ include:
 
 image: python:latest
 
-# Change pip's cache directory to be inside the project directory since we can
-# only cache local items.
-variables:
-  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-
-# Pip's cache doesn't store the python packages
-# https://pip.pypa.io/en/stable/reference/pip_install/#caching
-#
-# If you want to also cache the installed packages, you have to install
-# them in a virtualenv and cache it as well.
-cache:
-  paths:
-    - .cache/pip
-    - venv/
-
 before_script:
   - pip install virtualenv
   - virtualenv venv

More information about the neon-notifications mailing list