module-qc-tools 2.2.1rc0__tar.gz → 2.2.3__tar.gz

{module_qc_tools-2.2.1rc0 → module_qc_tools-2.2.3}/.gitlab-ci.yml

@@ -1,4 +1,5 @@
 stages:
+  - autoupdate
   - check
   - test
   - build
@@ -13,8 +14,9 @@ cache:
   paths:
     - .cache/pip
     - .cache/pre-commit
+    - venv/
 
-image: python:3.7-buster
+image: python:3.11-buster
 before_script:
   # want to set up a virtualenv to cache
   - apt-get install -y --no-install-recommends git
@@ -28,22 +30,69 @@ before_script:
     " | git credential approve
   - python -m venv venv
   - source venv/bin/activate
-  - python -m pip install --upgrade pip
   - python -m pip install -U pip pipx
   - python -m pipx ensurepath
-  - python -m pip freeze
-  - python -m pip install check-jsonschema
+  - python -m pip freeze --local
 
-lint:
+# NB: repo-review requires python>=3.10
+review:
   image: python:3.10-buster
   stage: check
+  script:
+    - pipx run 'sp-repo-review[cli]' .
+
+lint:
+  stage: check
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"
+  script:
+    - pipx run hatch run lint
+
+pre-commit:
+  stage: check
+  variables:
+    PRE_COMMIT_HOME: "$CI_PROJECT_DIR/.cache/pre-commit"
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"
+  script:
+    - pipx run pre-commit run --hook-stage manual --all-files
+  cache:
+    key:
+      files:
+        - .pre-commit-config.yaml
+    paths:
+      - .cache/pre-commit
+
+pre-commit-autoupdate:
+  stage: autoupdate
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "schedule"
+      when: always
+    - if:
+        $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+      when: manual
+      # manual jobs need allow_failure? https://gitlab.com/gitlab-org/gitlab/-/issues/233876
+      allow_failure: true
   script:
     - python -m pip install pre-commit
-    - pre-commit run --all-files
+    - python -m pip freeze --local
+    - ci/pre-commit-update.sh
 
-SLDO:
+  cache:
+    key:
+      files:
+        - .pre-commit-config.yaml
+    paths:
+      - .cache/pre-commit
+
+.test:
+  image: python:3.7-buster
   stage: test
+
+SLDO:
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install .
     - echo "Running SLDO with toy emulator..."
     - measurement-SLDO -c $(module-qc-tools
@@ -58,8 +107,9 @@ SLDO:
     expire_in: 1 day
 
 VCAL_CALIBRATION:
-  stage: test
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install .
     - echo "Running VCAL_CALIBRATION with the toy emulator..."
     - measurement-VCAL-CALIBRATION -c $(module-qc-tools
@@ -76,8 +126,9 @@ VCAL_CALIBRATION:
     expire_in: 1 day
 
 ANALOG_READBACK:
-  stage: test
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install .
     - echo "Running ANALOG_READBACK with toy emulator..."
     - measurement-ANALOG-READBACK -c $(module-qc-tools
@@ -94,8 +145,9 @@ ANALOG_READBACK:
     expire_in: 1 day
 
 ADC_CALIBRATION:
-  stage: test
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install . --no-cache-dir
     - echo "Running ADC_CALIBRATION with the toy emulator..."
     - measurement-ADC-CALIBRATION -c $(module-qc-tools
@@ -112,8 +164,9 @@ ADC_CALIBRATION:
     expire_in: 1 day
 
 INJECTION_CAPACITANCE:
-  stage: test
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install . --no-cache-dir
     - echo "Running INJECTION-CAPACITANCE with the toy emulator..."
     - measurement-INJECTION-CAPACITANCE -c $(module-qc-tools
@@ -130,8 +183,9 @@ INJECTION_CAPACITANCE:
     expire_in: 1 day
 
 LP_MODE:
-  stage: test
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install .
     - echo "Running LP_MODE with toy emulator..."
     - measurement-LP-MODE -c $(module-qc-tools
@@ -146,8 +200,9 @@ LP_MODE:
     expire_in: 1 day
 
 OVERVOLTAGE_PROTECTION:
-  stage: test
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install .
     - echo "Running OVERVOLTAGE_PROTECTION with toy emulator..."
     - measurement-OVERVOLTAGE-PROTECTION -c $(module-qc-tools
@@ -164,12 +219,13 @@ OVERVOLTAGE_PROTECTION:
     expire_in: 1 day
 
 UNDERSHUNT_PROTECTION:
-  stage: test
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install .
     - echo "Running UNDERSHUNT_PROTECTION with toy emulator..."
     - measurement-UNDERSHUNT-PROTECTION -c $(module-qc-tools
-      --prefix)/configs/emulator_merged_vmux.json -o ./
+      --prefix)/configs/emulator_merged_vmux.json -o ./ --site TEST
     - for file in Measurements/UNDERSHUNT_PROTECTION/*/*.json; do echo $file;
       jsonschema --instance $file $(module-qc-tools
       --prefix)/schema/common.json; done
@@ -182,8 +238,9 @@ UNDERSHUNT_PROTECTION:
     expire_in: 1 day
 
 IV_MEASURE:
-  stage: test
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install .
     - echo "Running IV-MEASURE with toy emulator..."
     - measurement-IV-MEASURE -c $(module-qc-tools
@@ -200,8 +257,9 @@ IV_MEASURE:
     expire_in: 1 day
 
 DATA_TRANSMISSION:
-  stage: test
+  extends: .test
   script:
+    - python -m pip install check-jsonschema
     - python3 -m pip install .
     - echo "Running DATA_TRANSMISSION with toy emulator..."
     - measurement-DATA-TRANSMISSION -c $(module-qc-tools
@@ -219,32 +277,34 @@ DATA_TRANSMISSION:
 
 package:
   stage: build
-  variables:
-    GIT_STRATEGY: clone
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push"
   script:
     - pipx run hatch run build-check
   artifacts:
     paths:
       - dist/
+    expire_in: 1 day
 
-.deploy:
+.deploy_package:
   stage: deploy
   dependencies:
     - package
   script:
     - pipx run hatch run upload
 
-deploy_gitlab:
-  extends: .deploy
+deploy_package_gitlab:
+  extends: .deploy_package
   rules:
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+    - if:
+        $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"
   variables:
-    TWINE_PASSWORD: "${CI_JOB_TOKEN}"
-    TWINE_USERNAME: "gitlab-ci-token"
     TWINE_REPOSITORY_URL: "https://gitlab.cern.ch/api/v4/projects/${CI_PROJECT_ID}/packages/pypi"
+    TWINE_USERNAME: "gitlab-ci-token"
+    TWINE_PASSWORD: "${CI_JOB_TOKEN}"
 
-deploy_production:
-  extends: .deploy
+deploy_package_pypi:
+  extends: .deploy_package
   only:
     - tags
   variables:

{module_qc_tools-2.2.1rc0 → module_qc_tools-2.2.3}/.pre-commit-config.yaml

@@ -3,38 +3,47 @@ ci:
   autofix_commit_msg: "style: pre-commit fixes"
 
 repos:
-  - repo: https://github.com/psf/black
-    rev: "23.3.0"
-    hooks:
-      - id: black-jupyter
-
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
-      - id: check-json
-      - id: trailing-whitespace
       # broken in old git from 2013
       # - id: check-added-large-files
       - id: check-case-conflict
       - id: check-merge-conflict
-      - id: check-case-conflict
-      - id: debug-statements
-      - id: mixed-line-ending
       - id: check-symlinks
-      - id: check-toml
       - id: check-yaml
-      - id: requirements-txt-fixer
+      - id: debug-statements
       - id: end-of-file-fixer
         # exclude generated files
         exclude: ^outputs/|\.dtd$|\.json$|\.xml$
+
+      - id: mixed-line-ending
       - id: name-tests-test
         args: ["--pytest-test-first"]
+      - id: requirements-txt-fixer
+      - id: trailing-whitespace
+      # additional not in scientific-python/cookie
+      - id: check-json
+      - id: check-toml
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.0.1 # keep at v4.0.1
     hooks:
       - id: check-added-large-files
 
+  - repo: https://github.com/adamchainz/blacken-docs
+    rev: 1.16.0
+    hooks:
+      - id: blacken-docs
+        additional_dependencies: [black==22.3.0]
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.2.0
+    hooks:
+      - id: ruff
+        args: ["--fix", "--show-fixes"]
+      - id: ruff-format
+
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: "v1.10.0"
     hooks:
@@ -42,37 +51,20 @@ repos:
       - id: rst-directive-colons
       - id: rst-inline-touching-normal
 
-  - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.4
-    hooks:
-      - id: codespell
-        files: ^.*\.(py|md|rst)$
-        args: ["-w", "-L", "hist,gaus"]
-
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.0-alpha.3"
+    rev: "v4.0.0-alpha.8"
     hooks:
       - id: prettier
         types_or: [yaml, markdown, html, css, scss, javascript] #, json]
         args: [--prose-wrap=always]
         language_version: 16.14.2
 
-  - repo: https://github.com/asottile/blacken-docs
-    rev: 1.13.0
-    hooks:
-      - id: blacken-docs
-        additional_dependencies: [black==22.3.0]
-
-  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.261
-    hooks:
-      - id: ruff
-        args: ["--fix", "--show-fixes"]
-
-  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.9.0.2
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.6
     hooks:
-      - id: shellcheck
+      - id: codespell
+        files: ^.*\.(py|md|rst)$
+        args: ["-w", "-L", "hist,gaus"]
 
   - repo: local
     hooks:
@@ -81,3 +73,19 @@ repos:
         language: pygrep
         entry: PyBind|Numpy|Cmake|CCache|Github|PyTest
         exclude: .pre-commit-config.yaml
+      - id: disallow-bad-permalinks
+        name: Disallow _ in permalinks
+        language: pygrep
+        entry: "^permalink:.*_.*"
+
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.9.0.6
+    hooks:
+      - id: shellcheck
+
+  # requires python>=3.10 to run
+  #- repo: https://github.com/scientific-python/cookie
+  #  rev: 2024.01.24
+  #  hooks:
+  #    - id: sp-repo-review
+  #      additional_dependencies: ["repo-review[cli]"]

{module_qc_tools-2.2.1rc0 → module_qc_tools-2.2.3}/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 The Python Packaging Authority
+Copyright (c) 2018 ATLAS ITk Pixel Modules
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal