Merge pull request #118 from nordic-institute/develop

chore: Updates for Metrics release 1.3.0

.github/dependabot.yml

@@ -0,0 +1,37 @@
+version: 2
+
+updates:
+  - package-ecosystem: pip
+    directories:
+      #- "/analysis_module"
+      #- "/analysis_ui_module"
+      - "/anonymizer_module"
+      - "/collector_module"
+      - "/corrector_module"
+      #- "/opendata_collector_module"
+      - "/opendata_module"
+      - "/reports_module"
+    schedule:
+        interval: "weekly"
+        day: "thursday"
+    groups:
+      python-minor-patch:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"
+      python-major:
+        applies-to: version-updates
+        update-types:
+          - "major"
+
+  - package-ecosystem: "github-actions"
+    directory: "/.github/workflows"
+    schedule:
+      interval: "weekly"
+      day: "thursday"
+    groups:
+      actions-update:
+        applies-to: version-updates
+        patterns:
+          - "*"

.github/workflows/run-tests.yml

@@ -1,108 +1,120 @@
-name: X-Road Metrics tests
+name: X-Road Metrics Tests
 on: [pull_request]
 jobs:
   Test-Anonymizer:
+    name: Anonymizer Tests
     runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./anonymizer_module
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           cache: 'pip'
+          cache-dependency-path: ./anonymizer_module/setup.py
       - name: Install dependencies
         run: pip install -r test_requirements.txt
       - name: Install tox
         run: pip install tox
       - name: Run tox tests
         run: tox
   Test-Collector:
+    name: Collector Tests
     runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./collector_module
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           cache: 'pip'
+          cache-dependency-path: ./collector_module/setup.py
       - name: Install dependencies
         run: pip install -r test_requirements.txt
       - name: Install tox
         run: pip install tox
       - name: Run tox tests
         run: tox
   Test-Corrector:
+    name: Corrector Tests
     runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./corrector_module
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           cache: 'pip'
+          cache-dependency-path: ./corrector_module/setup.py
       - name: Install dependencies
         run: pip install -r test_requirements.txt
       - name: Install tox
         run: pip install tox
       - name: Run tox tests
         run: tox
   Test-Opendata:
+    name: OpenData Tests
     runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./opendata_module
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
-        with:
-          python-version: '3.8'
-          cache: 'pip'
-      - name: Install dependencies
-        run: pip install -r test_requirements.txt
-      - name: Install tox
-        run: pip install tox
-      - name: Run tox tests
-        run: tox
-  Test-Opendata-Collector:
-    runs-on: ubuntu-22.04
-    defaults:
-      run:
-        working-directory: ./opendata_collector_module
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           cache: 'pip'
+          cache-dependency-path: ./opendata_module/setup.py
       - name: Install dependencies
         run: pip install -r test_requirements.txt
       - name: Install tox
         run: pip install tox
       - name: Run tox tests
         run: tox
+  # Test-Opendata-Collector:
+  #   name: OpenData Collector Tests
+  #   runs-on: ubuntu-22.04
+  #   defaults:
+  #     run:
+  #       working-directory: ./opendata_collector_module
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: Set up Python 3.8
+  #       uses: actions/setup-python@v5
+  #       with:
+  #         python-version: '3.8'
+  #         cache: 'pip'
+  #         cache-dependency-path: ./opendata_collector_module/setup.py
+  #     - name: Install dependencies
+  #       run: pip install -r test_requirements.txt
+  #     - name: Install tox
+  #       run: pip install tox
+  #     - name: Run tox tests
+  #       run: tox
   Test-Reports:
+    name: Reports Tests
     runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./reports_module
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.8
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.8'
           cache: 'pip'
+          cache-dependency-path: ./reports_module/setup.py
       - name: Install dependencies
         run: pip install -r test_requirements.txt
       - name: Install tox

.gitignore

@@ -48,7 +48,7 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
-test_results.xml
+test_results.*
 
 # Translations
 *.mo

.ort.yml

@@ -0,0 +1,68 @@
+---
+excludes:
+  paths:
+  - pattern: "**/test_requirements.txt"
+    reason: "TEST_OF"
+    comment: "Requirements for testing."
+  - pattern: "3RD-PARTY-NOTICES.txt"
+    reason: "DOCUMENTATION_OF"
+    comment: "3rd party notices."
+
+  scopes:
+  - pattern: "checkstyle"
+    reason: "BUILD_DEPENDENCY_OF"
+    comment: "Packages for code styling checks (testing) only."
+
+  - pattern: "devDependencies"
+    reason: "DEV_DEPENDENCY_OF"
+    comment: "Packages for development only."
+
+  - pattern: "jacocoAgent"
+    reason: "TEST_DEPENDENCY_OF"
+    comment: "Packages for code coverage (testing) only."
+
+  - pattern: "jacocoAnt"
+    reason: "TEST_DEPENDENCY_OF"
+    comment: "Packages for code coverage (testing) only."
+
+  - pattern: "test.*"
+    reason: "TEST_DEPENDENCY_OF"
+    comment: "Packages for testing only."
+
+  - pattern: "annotationProcessor"
+    reason: "DEV_DEPENDENCY_OF"
+    comment: "Packages for development only."
+
+  - pattern: "compileClasspath"
+    reason: "DEV_DEPENDENCY_OF"
+    comment: "Packages for development only."
+
+  - pattern: "compileOnly"
+    reason: "DEV_DEPENDENCY_OF"
+    comment: "Packages for development only."
+
+resolutions:
+  rule_violations:
+    - message: "copyleft-strong license GPL-2.0-or-later in PyPI::jinja2:2.10.1."
+      reason: "LICENSE_ACQUIRED_EXCEPTION"
+      comment: "The files meant by this license hit are not in use in X-Road-Metrics."
+
+    - message: "copyleft-strong license GPL-3.0-or-later WITH GCC-exception-3.1 in PyPI::scipy:1.10.1."
+      reason: "LICENSE_ACQUIRED_EXCEPTION"
+      comment: "The exception applies, hence license acquired."
+
+    - message: "copyleft-strong license GPL-3.0-or-later WITH GCC-exception-3.1 in PyPI::numpy:1.24.4."
+      reason: "LICENSE_ACQUIRED_EXCEPTION"
+      comment: "The exception applies, hence license acquired."
+
+    - message: "copyleft-strong license GPL-3.0-only WITH GCC-exception-3.1 in PyPI::numpy:1.24.4."
+      reason: "LICENSE_ACQUIRED_EXCEPTION"
+      comment: "The exception applies, hence license acquired."
+
+    - message: "free-restricted license Bitstream-Vera in PyPI::matplotlib:3.1.2."
+      reason: "LICENSE_ACQUIRED_EXCEPTION"
+      comment: "Font files that are not modified, hence license acquired."
+
+    - message: "free-restricted license Bitstream-Vera in PyPI::matplotlib:3.1.2."
+      reason: "LICENSE_ACQUIRED_EXCEPTION"
+      comment: "Font files that are not modified, hence license acquired."