prefpicker 2.7.0__tar.gz → 2.9.0__tar.gz

prefpicker-2.9.0/.github/workflows/ci.yml

@@ -0,0 +1,113 @@
+name: Python CI
+
+on:
+  pull_request:
+    branches: [ main, master ]
+  push:
+    branches: [ main, master ]
+  release:
+    types: [ released ]
+  workflow_dispatch:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    name: Lint
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install tox
+        run: pipx install tox
+
+      - name: Run linters
+        run: tox -e lint
+
+  test:
+    name: Python ${{ matrix.python-version }} (${{ matrix.platform }})
+    needs: lint
+    runs-on: ${{ matrix.platform }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python-version: "3.9"
+            platform: ubuntu-latest
+            toxenv: py39
+          - python-version: "3.10"
+            platform: ubuntu-latest
+            toxenv: py310
+          - python-version: "3.11"
+            platform: ubuntu-latest
+            toxenv: py311
+          - python-version: "3.12"
+            platform: ubuntu-latest
+            toxenv: py312
+          - python-version: "3.13"
+            platform: ubuntu-latest
+            toxenv: py313
+          - python-version: "3.12"
+            platform: macos-latest
+            toxenv: py312
+          - python-version: "3.12"
+            platform: windows-latest
+            toxenv: py312
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install python ${{ matrix.python-version }}
+        uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Run tests
+        run: pipx run tox -e ${{ matrix.toxenv }}
+
+      - name: Run codecov
+        env:
+          CODECOV_TOKEN:
+            ${{ secrets.CODECOV_TOKEN }}
+        run: pipx run tox -e codecov
+
+  release:
+    runs-on: ubuntu-latest
+    needs: test
+    if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main')
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Install python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Run release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+        run: |
+          pipx run 'python-semantic-release~=10.0' -v version --no-changelog
+          pipx run 'python-semantic-release~=10.0' -v publish
+
+      - name: Upload to PyPI
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: |
+          shopt -s nullglob
+          files=(dist/*)
+          if [[ ${#files[@]} -gt 0 ]]; then
+            echo "Uploading ${#files[@]} files to PyPI..."
+            pipx run twine upload --skip-existing "${files[@]}"
+          else
+            echo "No distribution files found. Skipping upload."
+          fi

{prefpicker-2.7.0 → prefpicker-2.9.0}/.pre-commit-config.yaml

@@ -4,10 +4,7 @@ repos:
     hooks:
       - id: ruff
         args: [--fix]
-  - repo: https://github.com/ambv/black
-    rev: 24.10.0
-    hooks:
-      - id: black
+      - id: ruff-format
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
@@ -33,14 +30,6 @@ repos:
     hooks:
       - id: codespell
         exclude_types: [json]
-  - repo: https://github.com/marco-c/taskcluster_yml_validator
-    rev: v0.0.12
-    hooks:
-      - id: taskcluster_yml
-  - repo: https://github.com/MozillaSecurity/orion-ci
-    rev: v0.0.10
-    hooks:
-      - id: orion_ci
   - repo: meta
     hooks:
       - id: check-useless-excludes

{prefpicker-2.7.0 → prefpicker-2.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: prefpicker
-Version: 2.7.0
+Version: 2.9.0
 Summary: PrefPicker - Manage & generate prefs.js files
 Home-page: https://github.com/MozillaSecurity/prefpicker
 Author: Tyson Smith
@@ -19,10 +19,11 @@ Requires-Dist: PyYAML
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: tox; extra == "dev"
+Dynamic: license-file
 
 PrefPicker
 ==========
-[![Task Status](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaSecurity/prefpicker/master/badge.svg)](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaSecurity/prefpicker/master/latest)
+[![CI](https://github.com/MozillaSecurity/prefpicker/actions/workflows/ci.yml/badge.svg)](https://github.com/MozillaSecurity/prefpicker/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/MozillaSecurity/prefpicker/branch/master/graph/badge.svg)](https://codecov.io/gh/MozillaSecurity/prefpicker)
 [![Matrix](https://img.shields.io/badge/chat-%23fuzzing-green?logo=matrix)](https://matrix.to/#/#fuzzing:mozilla.org)
 [![PyPI](https://img.shields.io/pypi/v/prefpicker)](https://pypi.org/project/prefpicker)

{prefpicker-2.7.0 → prefpicker-2.9.0}/README.md

@@ -1,6 +1,6 @@
 PrefPicker
 ==========
-[![Task Status](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaSecurity/prefpicker/master/badge.svg)](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaSecurity/prefpicker/master/latest)
+[![CI](https://github.com/MozillaSecurity/prefpicker/actions/workflows/ci.yml/badge.svg)](https://github.com/MozillaSecurity/prefpicker/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/MozillaSecurity/prefpicker/branch/master/graph/badge.svg)](https://codecov.io/gh/MozillaSecurity/prefpicker)
 [![Matrix](https://img.shields.io/badge/chat-%23fuzzing-green?logo=matrix)](https://matrix.to/#/#fuzzing:mozilla.org)
 [![PyPI](https://img.shields.io/pypi/v/prefpicker)](https://pypi.org/project/prefpicker)

{prefpicker-2.7.0 → prefpicker-2.9.0}/pyproject.toml

@@ -79,13 +79,8 @@ select = [
     "W",
 ]
 
-[semantic_release]
+[tool.semantic_release]
 tag_format = "{version}"
-build_command = "SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PREFPICKER=$NEW_VERSION python -m build -v && twine upload --skip-existing dist/*"
-build_command_env = ["TWINE_USERNAME", "TWINE_PASSWORD"]
-
-[semantic_release.commit_author]
-env = "GIT_COMMIT_AUTHOR"
-default = "semantic-release <prefpicker@mozilla.com>"
+build_command = "SETUPTOOLS_SCM_PRETEND_VERSION_FOR_PREFPICKER=$NEW_VERSION pipx run build -v"
 
 [tool.setuptools_scm]

{prefpicker-2.7.0 → prefpicker-2.9.0}/src/prefpicker/main.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 """prefpicker module main"""
+
 from __future__ import annotations
 
 from argparse import ArgumentParser, Namespace

{prefpicker-2.7.0 → prefpicker-2.9.0}/src/prefpicker/prefpicker.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 """prefpicker module"""
+
 from __future__ import annotations
 
 from datetime import datetime, timezone
@@ -16,7 +17,7 @@ from yaml.parser import ParserError
 from yaml.scanner import ScannerError
 
 if TYPE_CHECKING:
-    from collections.abc import Iterator
+    from collections.abc import Generator
 
 __author__ = "Tyson Smith"
 __credits__ = ["Tyson Smith"]
@@ -43,7 +44,7 @@ class PrefPicker:  # pylint: disable=missing-docstring
         self.prefs: dict[str, dict[str, PrefVariant]] = {}
         self.variants: set[str] = {"default"}
 
-    def check_combinations(self) -> Iterator[tuple[str, int]]:
+    def check_combinations(self) -> Generator[tuple[str, int]]:
         """Count the number of combinations for each variation. Only return
            variants that have more than one combination.
 
@@ -65,7 +66,7 @@ class PrefPicker:  # pylint: disable=missing-docstring
             if count > 1:
                 yield (variant, count)
 
-    def check_duplicates(self) -> Iterator[tuple[str, str]]:
+    def check_duplicates(self) -> Generator[tuple[str, str]]:
         """Look for variants with values that appear more than once per variant.
 
         Args:
@@ -80,7 +81,7 @@ class PrefPicker:  # pylint: disable=missing-docstring
                 if len(variants[variant]) != len(set(variants[variant])):
                     yield (pref, variant)
 
-    def check_overwrites(self) -> Iterator[tuple[str, str, PrefValue]]:
+    def check_overwrites(self) -> Generator[tuple[str, str, PrefValue]]:
         """Look for variants that overwrite the default with the same value.
 
         Args:
@@ -187,7 +188,7 @@ class PrefPicker:  # pylint: disable=missing-docstring
         return picker
 
     @staticmethod
-    def templates() -> Iterator[Path]:
+    def templates() -> Generator[Path]:
         """Available YAML template files.
 
         Args:

{prefpicker-2.7.0 → prefpicker-2.9.0}/src/prefpicker/templates/browser-fuzzing.yml

@@ -360,6 +360,12 @@ pref:
     variants:
       default:
       - 0
+  dom.navigation.webidl.enabled:
+    review_on_close:
+    - 1777171
+    variants:
+      default:
+      - false
   dom.paintWorklet.enabled:
     review_on_close:
     - 1685228

{prefpicker-2.7.0 → prefpicker-2.9.0}/src/prefpicker/templates/schema.json

@@ -6,26 +6,39 @@
   "properties": {
     "pref": {
       "type": "object",
+      "additionalProperties": false,
       "patternProperties": {
-        "^.*$": {
+        "^.+$": {
           "additionalProperties": false,
           "type": "object",
           "properties": {
             "variants": {
               "type": "object",
+              "additionalProperties": false,
               "patternProperties": {
-                "^.*$": {
-                  "type": "array"
+                "^.+$": {
+                  "type": "array",
+                  "minItems": 1,
+                  "items": {
+                    "type": ["boolean", "integer", "null", "string"]
+                  }
                 }
-              }
+              },
+              "required": [
+                "default"
+              ]
             },
             "review_on_close": {
               "type": "array",
+              "minItems": 1,
               "items": {
-                "type": "number"
+                "type": "integer"
               }
             }
-          }
+          },
+          "required": [
+            "variants"
+          ]
         }
       }
     },

{prefpicker-2.7.0 → prefpicker-2.9.0}/src/prefpicker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: prefpicker
-Version: 2.7.0
+Version: 2.9.0
 Summary: PrefPicker - Manage & generate prefs.js files
 Home-page: https://github.com/MozillaSecurity/prefpicker
 Author: Tyson Smith
@@ -19,10 +19,11 @@ Requires-Dist: PyYAML
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: tox; extra == "dev"
+Dynamic: license-file
 
 PrefPicker
 ==========
-[![Task Status](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaSecurity/prefpicker/master/badge.svg)](https://community-tc.services.mozilla.com/api/github/v1/repository/MozillaSecurity/prefpicker/master/latest)
+[![CI](https://github.com/MozillaSecurity/prefpicker/actions/workflows/ci.yml/badge.svg)](https://github.com/MozillaSecurity/prefpicker/actions/workflows/ci.yml)
 [![codecov](https://codecov.io/gh/MozillaSecurity/prefpicker/branch/master/graph/badge.svg)](https://codecov.io/gh/MozillaSecurity/prefpicker)
 [![Matrix](https://img.shields.io/badge/chat-%23fuzzing-green?logo=matrix)](https://matrix.to/#/#fuzzing:mozilla.org)
 [![PyPI](https://img.shields.io/pypi/v/prefpicker)](https://pypi.org/project/prefpicker)

{prefpicker-2.7.0 → prefpicker-2.9.0}/src/prefpicker.egg-info/SOURCES.txt

@@ -1,7 +1,5 @@
-.codecov.yml
 .gitignore
 .pre-commit-config.yaml
-.taskcluster.yml
 CODE_OF_CONDUCT.md
 LICENSE
 MANIFEST.in
@@ -10,6 +8,7 @@ pyproject.toml
 setup.cfg
 tox.ini
 .github/CODEOWNERS
+.github/workflows/ci.yml
 .github/workflows/prefmonitor.yml
 src/prefpicker/__init__.py
 src/prefpicker/__main__.py

{prefpicker-2.7.0 → prefpicker-2.9.0}/tox.ini

@@ -22,19 +22,17 @@ usedevelop = true
 
 [testenv:codecov]
 commands =
-    codecov
+    codecov upload-process
 deps =
+    codecov-cli
     coverage[toml]
 skip_install = true
-allowlist_externals =
-    codecov
 
 [testenv:lint]
 commands =
     pre-commit run -a {posargs}
 deps =
     pre-commit
-skip_install = true
 
 [testenv:mypy]
 commands =
@@ -49,12 +47,3 @@ commands =
 deps =
     pylint==3.3.3
 usedevelop = true
-
-[testenv:release]
-skip_install = true
-commands =
-    semantic-release -v version --no-changelog --no-commit --no-vcs-release
-deps =
-    build
-    python-semantic-release>=8.0.0
-    twine

prefpicker-2.7.0/.codecov.yml

@@ -1,3 +0,0 @@
-codecov:
-  ci:
-    - community-tc.services.mozilla.com

prefpicker-2.7.0/.taskcluster.yml

@@ -1,132 +0,0 @@
-version: 1
-policy:
-  pullRequests: collaborators
-tasks:
-  $let:
-    user: ${event.sender.login}
-
-    fetch_rev:
-      $if: 'tasks_for == "github-pull-request"'
-      then: ${event.pull_request.head.sha}
-      else:
-        $if: 'tasks_for == "github-push"'
-        then: ${event.after}
-        else: ${event.release.tag_name}
-
-    fetch_ref:
-      $if: 'tasks_for == "github-pull-request"'
-      then: ${event.pull_request.head.sha}
-      else:
-        $if: 'tasks_for == "github-push"'
-        then: ${event.after}
-        else: "refs/tags/${event.release.tag_name}:refs/tags/${event.release.tag_name}"
-
-    http_repo:
-      $if: 'tasks_for == "github-pull-request"'
-      then: ${event.pull_request.base.repo.clone_url}
-      else: ${event.repository.clone_url}
-
-    codecov_secret:
-      codecov-prefpicker
-
-    pypi_secret:
-      pypi-prefpicker
-
-    project_name:
-      PrefPicker
-
-    matrix:
-      language: python
-      secrets:
-        - type: env
-          secret: project/fuzzing/codecov-prefpicker
-          name: CODECOV_TOKEN
-          key: token
-      script:
-        - bash
-        - '-xec'
-        - tox; tox -e codecov
-      jobs:
-        include:
-          - name: tests python 3.9
-            version: "3.9"
-            env:
-              TOXENV: py39,lint
-          - name: tests python 3.10
-            version: "3.10"
-            env:
-              TOXENV: py310,lint
-          - name: tests python 3.10 (windows)
-            version: "3.10"
-            platform: windows
-            env:
-              TOXENV: py310
-          - name: tests python 3.11
-            version: "3.11"
-            env:
-              TOXENV: py311,lint
-          - name: tests python 3.12
-            version: "3.12"
-            env:
-              TOXENV: py312,lint
-          - name: semantic-release
-            version: "3.9"
-            script:
-              - bash
-              - '-xec'
-              - >-
-                git fetch origin master --tags;
-                git checkout -b master;
-                tox -e release
-            when:
-              branch: master
-              all_passed: true
-            secrets:
-              - type: env
-                secret: project/fuzzing/pypi-prefpicker
-                name: TWINE_USERNAME
-                key: username
-              - type: env
-                secret: project/fuzzing/pypi-prefpicker
-                name: TWINE_PASSWORD
-                key: password
-              - type: key
-                secret: project/fuzzing/deploy-prefpicker
-                key: key
-
-  in:
-    $if: 'tasks_for in ["github-push", "github-release"] || (tasks_for == "github-pull-request" && event["action"] in ["opened", "reopened", "synchronize"])'
-    then:
-      - created: {$fromNow: ''}
-        deadline: {$fromNow: '1 hour'}
-        provisionerId: proj-fuzzing
-        workerType: decision
-        payload:
-          features:
-            taskclusterProxy: true
-          maxRunTime: 3600
-          image:
-            type: indexed-image
-            path: public/orion-decision.tar.zst
-            namespace: project.fuzzing.orion.orion-decision.master
-          env:
-            PROJECT_NAME: ${project_name}
-            CI_MATRIX: {$json: {$eval: matrix}}
-            GITHUB_EVENT: {$json: {$eval: event}}
-            GITHUB_ACTION: ${tasks_for}
-            TASKCLUSTER_NOW: ${now}
-          command:
-            - ci-decision
-            - -v
-        scopes:
-          - queue:create-task:highest:proj-fuzzing/ci
-          - queue:create-task:highest:proj-fuzzing/ci-*
-          - queue:scheduler-id:taskcluster-github
-          - secrets:get:project/fuzzing/codecov-prefpicker
-          - secrets:get:project/fuzzing/deploy-prefpicker
-          - secrets:get:project/fuzzing/pypi-prefpicker
-        metadata:
-          name: ${project_name} CI decision
-          description: Schedule CI tasks for ${project_name}
-          owner: ${user}@users.noreply.github.com
-          source: https://github.com/MozillaSecurity/prefpicker