WIP

Author: seanbudd

.gitattributes

@@ -1,2 +1,26 @@
 eol=lf
 *	text=auto
+
+# Source files
+# ============
+*.pxd    text diff=python
+*.py     text diff=python
+*.py3    text diff=python
+*.pyw    text diff=python
+*.pyx    text diff=python
+*.pyz    text diff=python
+
+# Binary files
+# ============
+*.db     binary
+*.p      binary
+*.pkl    binary
+*.pickle binary
+*.pyc    binary
+*.pyd    binary
+*.pyo    binary
+
+# Note: .db, .p, and .pkl files are associated
+# with the python modules ``pickle``, ``dbm.*``,
+# ``shelve``, ``marshal``, ``anydbm``, & ``bsddb``
+# (among others).

…lidation/.github/workflows/testCode.yaml .github/workflows/testCode.yamlvalidation/.github/workflows/testCode.yaml renamed to .github/workflows/testCode.yaml validation/.github/workflows/testCode.yaml renamed to .github/workflows/testCode.yaml

@@ -1,4 +1,4 @@
-name: Test code
+name: Test validation code
 
 on:
   push:
@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 jobs:
-  testCode:
+  testAllCode:
     runs-on: windows-latest
     strategy:
       matrix:
@@ -22,24 +22,36 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64
-    - name: Run unit tests
+    - name: Run unit tests for transform and validation
       shell: cmd
-      # Run automated/unit tests
       run: .\rununittests.bat
-    - name: Lint
-      shell: cmd
-      # Check code with the linter
-      run: .\runlint.bat
+    - name: Run pyright for validation
+      run: uv run --group lint --directory validation pyright --threads --level warning
+    - name: Run pyright for transform
+      run: uv run --group lint --directory transform pyright --threads --level warning
+  testValidationCode:
+    defaults:
+      run:
+        shell: cmd
+        working-directory: validation
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        python-version: [3.13]
+    steps:
+    - name: Install the latest version of uv
+      uses: astral-sh/setup-uv@v6
+    - name: Checkout code
+      uses: actions/checkout@v5
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+        architecture: x64
     - name: Validate metadata
-      shell: cmd
       # E2E: test to check the script can be run, no need to actually test the file.
       # The internal checks are covered with unit tests.
       run: .\runvalidate.bat --dry-run tests/testData/addons/fake/13.0.0.json tests/testData/nvdaAPIVersions.json
-    - name: Get sha256
-      shell: cmd
-      # E2E: test to check the script can be run
-      run: .\runsha.bat tests/testData/fake.nvda-addon
     - name: Generate json file
-      shell: cmd
       # E2E: test to check the script can be run
       run: .\runcreatejson.bat -f tests/testData/fake.nvda-addon --dir tests/testOutput/test_runcreatejson --channel=stable --publisher=fakepublisher --sourceUrl=https://github.com/fake/ --url=https://github.com/fake.nvda-addon --licName="GPL v2" --licUrl="https://www.gnu.org/licenses/gpl-2.0.html"

.github/workflows/transformDataToViews.yml

@@ -38,7 +38,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         cd transform
-        pip install -r requirements.txt
         # empty the views git folder directory 
         Try { Remove-Item ../views/views/ -Recurse -ErrorAction stop }
         Catch [System.Management.Automation.ItemNotFoundException] { $null }

.gitignore

@@ -0,0 +1,11 @@
+.venv
+venv
+__pycache__
+*.egg-info
+*.pyc
+
+.idea
+.vscode
+
+transform/src/tests/test_data
+testOutput

validation/.pre-commit-config.yaml .pre-commit-config.yamlvalidation/.pre-commit-config.yaml renamed to .pre-commit-config.yaml

@@ -9,6 +9,8 @@ ci:
   autofix_commit_msg: "Pre-commit auto-fix"
   submodules: true
 
+exclude: addons/.*/.*\.json
+
 default_language_version:
   python: python3.13
 
@@ -73,7 +75,7 @@ repos:
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Matches Ruff version in pyproject.
-  rev: v0.14.10
+  rev: v0.15.7
   hooks:
     - id: ruff
       name: lint with ruff
@@ -82,13 +84,13 @@ repos:
       name: format with ruff
 
 - repo: https://github.com/RobertCraigie/pyright-python
-  rev: v1.1.407
+  rev: v1.1.408
   hooks:
   - id: pyright
     name: Check types with pyright
 
 - repo: https://github.com/astral-sh/uv-pre-commit
-  rev: 0.9.21
+  rev: v0.11.0
   hooks:
     - id: uv-lock
       name: Verify uv lock file

validation/.python-version .python-versionvalidation/.python-version renamed to .python-version

@@ -14,7 +14,7 @@ Add-on authors who wish to have their add-on distributed through the Add-on Stor
 
 For an overview of the whole Add-on Store, read [the design overview](./docs/design/designOverview.md).
 
-### About security 
+### About security
 
 Add-ons are run at user's own risk, add-ons in the add-on store do not undergo human security audits.
 The add-on store includes the following security measures:
@@ -29,6 +29,7 @@ Please contact the flagged security vendors to get them to review and unflag the
 Please email info@nvaccess.org if you need assistance with this process.
 
 ## Human review process / code audit
+
 - NV Access doesn't require a manual review of the add-on (code or user experience) itself before the add-on submission.
 - NV Access manually maintains a list of approved submitters with permission to submit an add-on to the store.
 The process NV Access follows is described [here](./docs/dev/submissionReview.md#approving-an-author-to-submit-to-a-particular-add-on-id-for-the-first-time).
@@ -50,3 +51,8 @@ A plain language summary can be found [here](https://opendatacommons.org/license
 
 - Status for latest submitted add-on: [![view submissions](https://github.com/nvaccess/addon-datastore/actions/workflows/sendJsonFile.yml/badge.svg)](https://github.com/nvaccess/addon-datastore/actions/workflows/sendJsonFile.yml)
 - Status for validating all submitted add-ons: [![view validation attempts](https://github.com/nvaccess/addon-datastore/actions/workflows/validateAllAddons.yml/badge.svg)](https://github.com/nvaccess/addon-datastore/actions/workflows/validateAllAddons.yml)
+
+## Dependencies
+
+* [Python](https://www.python.org/) 3.13, 64 bit
+* [uv](https://docs.astral.sh/uv/getting-started/installation/)

README.md

@@ -1,11 +1,11 @@
 [build-system]
-requires = ["setuptools~=72.0", "wheel"]
+requires = ["setuptools~=82.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "addon-datastore-validation"
+name = "addon-datastore"
 dynamic = ["version"]
-description = "Add-on datastore validation"
+description = "Add-on datastore"
 maintainers = [
 	{name = "NV Access", email = "info@nvaccess.org"},
 ]
@@ -20,14 +20,15 @@ classifiers = [
 readme = "readme.md"
 license = {file = "LICENSE"}
 dependencies = [
-	"configobj",
-	"jsonschema==4.25.1",
+	"configobj==5.0.6",
+	"jsonschema==4.26.0",
+	"requests==2.32.5",
 ]
 
 [project.urls]
 Homepage = "https://www.nvaccess.org/"
-Repository = "https://github.com/nvaccess/addon-datastore-validation.git"
-Issues = "https://github.com/nvaccess/addon-datastore-validation/issues"
+Repository = "https://github.com/nvaccess/addon-datastore.git"
+Issues = "https://github.com/nvaccess/addon-datastore/issues"
 
 [tool.pyright]
 venvPath = ".venv"
@@ -71,7 +72,10 @@ environments = ["sys_platform == 'win32'"]
 required-version = ">=0.8"
 
 [tool.setuptools]
-package-dir = {"" = "_validate"}
+
+[tool.setuptools.packages.find]
+where = ["validation", "transform"]
+include = ["_validate*", "src*"]
 
 [tool.uv.sources]
 configobj = { git = "https://github.com/DiffSK/configobj", rev = "8be54629ee7c26acb5c865b74c76284e80f3aa31" }
@@ -85,7 +89,7 @@ lint = [
 
 unit-tests = [
 	# Creating XML unit test reports
-	"unittest-xml-reporting==3.2.0",
+	"unittest-xml-reporting==4.0.0",
 ]
 
 [tool.ruff]

validation/pyproject.toml pyproject.tomlvalidation/pyproject.toml renamed to pyproject.toml

@@ -0,0 +1,11 @@
+@echo off
+set hereOrig=%~dp0
+set here=%hereOrig%
+if #%hereOrig:~-1%# == #\# set here=%hereOrig:~0,-1%
+set validationUnitTestsPath=%here%\validation\tests
+set transformUnitTestsPath=%here%\transform\tests
+set testOutput=%here%\testOutput
+md %testOutput%
+
+call uv run --group unit-tests --directory "%here%" -m xmlrunner discover -b -s "%validationUnitTestsPath%" -t "%here%" --output-file "%testOutput%\validationUnitTests.xml" %*
+call uv run --group unit-tests --directory "%here%" -m xmlrunner discover -b -s "%transformUnitTestsPath%" -t "%here%" --output-file "%testOutput%\transformUnitTests.xml" %*