Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/checkTranslatorsComments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Python 3.8
uses: actions/setup-python@v5
- name: Set up Python 3.13
uses: actions/setup-python@v6
with:
python-version: 3.11
python-version: 3.13

- name: Install dependencies
run: |
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/manualRelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,17 @@ jobs:
buildAndUpload:
continue-on-error: true
runs-on: ubuntu-latest
permissions:
contents: write

steps:
- id: checkoutCode
name: Checkout code
uses: actions/checkout@v4
- name: Set up Python 3.11
uses: actions/setup-python@v5
uses: actions/checkout@v5
- name: Set up Python 3.13
uses: actions/setup-python@v6
with:
python-version: 3.11
python-version: 3.13
- name: Install dependencies
run: |
pip install scons markdown
Expand All @@ -40,7 +42,7 @@ jobs:
with open("buildVars.py", 'r+', encoding='utf-8') as f:
text = f.read()
version = "${{ github.event.inputs.version }}"
text = re.sub(r"\"addon_version\": .*?,", f"\"addon_version\": \"{version}\",", text)
text = re.sub(r"addon_version=\".*?\",", f"addon_version=\"{version}\",", text)
f.seek(0)
f.write(text)
f.truncate()
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ addon/doc/*.css
addon/doc/en/
*_docHandler.py
*.html
addon/*.ini
addon/locale/*/*.ini
manifest.ini
*.mo
*.pot
*.pyc
*.py[co]
*.nvda-addon
.sconsign.dblite
/[0-9]*.[0-9]*.[0-9]*.json
41 changes: 16 additions & 25 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@

# Copied from https://github.com/nvaccess/nvda
# https://pre-commit.ci/
# Configuration for Continuous Integration service
ci:
skip: [pyrightLocal]
# Pyright does not seem to work in pre-commit CI
skip: [pyright]
autoupdate_schedule: monthly
autoupdate_commit_msg: "Pre-commit auto-update"
autofix_commit_msg: "Pre-commit auto-fix"
submodules: true

default_language_version:
python: python3.11
python: python3.13

repos:
- repo: https://github.com/pre-commit-ci/pre-commit-ci-config
Expand All @@ -29,7 +30,7 @@ repos:
hooks:
# Prevents commits to certain branches
- id: no-commit-to-branch
args: ["--branch", "main"]
args: ["--branch", "main", "--branch", "master", ]
# Checks that large files have not been added. Default cut-off for "large" files is 500kb.
- id: check-added-large-files
# Checks python syntax
Expand All @@ -42,26 +43,24 @@ repos:
- id: debug-statements
# Removes trailing whitespace.
- id: trailing-whitespace
types_or: [python, markdown, toml, yaml]
types_or: [python, c, c++, batch, markdown, toml, yaml, powershell]
# Ensures all files end in 1 (and only 1) newline.
- id: end-of-file-fixer
types_or: [python, markdown, toml, yaml]
types_or: [python, c, c++, batch, markdown, toml, yaml, powershell]
# Removes the UTF-8 BOM from files that have it.
# See https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/codingStandards.md#encoding
- id: fix-byte-order-marker
types_or: [python, markdown, toml, yaml]
types_or: [python, c, c++, batch, markdown, toml, yaml, powershell]
# Validates TOML files.
- id: check-toml
# Validates YAML files.
- id: check-yaml
# Validates XML files.
# Ensures that links to lines in files under version control point to a particular commit.
- id: check-vcs-permalinks
# Avoids using reserved Windows filenames.
- id: check-illegal-windows-names

- repo: https://github.com/asottile/add-trailing-comma
rev: v3.1.0
rev: v3.2.0
hooks:
# Ruff preserves indent/new-line formatting of function arguments, list items, and similar iterables,
# if a trailing comma is added.
Expand All @@ -70,27 +69,19 @@ repos:

- repo: https://github.com/astral-sh/ruff-pre-commit
# Matches Ruff version in pyproject.
rev: v0.8.1
rev: v0.12.7
hooks:
- id: ruff
name: lint with ruff
args: [ --fix ]
- id: ruff-format
name: format with ruff

- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.394
- repo: local
hooks:
- id: pyright
alias: pyrightLocal
name: Check types with pyright

- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.396
hooks:
- id: pyright
alias: pyrightCI
name: Check types with pyright
# use nodejs version of pyright and install pyproject.toml for CI
additional_dependencies: [".", "pyright[nodejs]"]
stages: [manual] # Only run from CI manually
- id: pyright
name: type check with pyright
entry: uv run pyright
language: system
types: [python]
12 changes: 2 additions & 10 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,10 @@
// Extension identifier format: ${publisher}.${name}. Example: vscode.csharp
// List of extensions which should be recommended for users of this workspace.
"recommendations": [
"ms-vscode.cpptools",
"ms-python.python",
"ms-python.vscode-pylance",
"cschlosser.doxdocgen",
"davidanson.vscode-markdownlint",
"ms-vscode.powershell",
"charliermarsh.ruff",
"editorconfig.editorconfig",
"njpwerner.autodocstring",
"ms-python.debugpy",
"ms-vscode.remote-server",
"benjamin-simmonds.pythoncpp-debug",
"redhat.vscode-yaml",
"charliermarsh.ruff"
],
// List of extensions recommended by VS Code that should not be recommended for users of this workspace.
"unwantedRecommendations": []
Expand Down
37 changes: 8 additions & 29 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,16 @@
{
"editor.accessibilitySupport": "on",
"ruff.enable": true,
"python.defaultInterpreterPath": "${workspaceFolder}/../nvda/.venv/Scripts/python.exe",
"python.autoComplete.extraPaths": [
"addon",
"${workspaceFolder}/../nvda/source",
"${workspaceFolder}/../nvda/miscDeps/python"
"../nvda/source",
"../nvda/miscDeps/python"
],
"python.analysis.extraPaths": [
"addon",
"${workspaceFolder}/../nvda/source",
"${workspaceFolder}/../nvda/miscDeps/python"
],
"python.analysis.stubPath": "${workspaceFolder}/.vscode/typings",
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.eol": "\n",
"editor.insertSpaces": false,
"python.testing.unittestArgs": [
"-v",
"-s",
"tests.unit",
"-p",
"test_*.py"
"python.analysis.stubPath": "${workspaceFolder}/.vscode/typings",
"python.analysis.extraPaths": [
"../nvda/source",
"../nvda/miscDeps/python"
],
"autoDocstring.docstringFormat": "sphinx-notypes",
"python.testing.pytestEnabled": false,
"python.testing.nosetestsEnabled": false,
"python.testing.unittestEnabled": true,
"[python]": {
"editor.defaultFormatter": "charliermarsh.ruff"
},
"python.analysis.autoImportCompletions": true,
"python.analysis.importFormat": "relative"
}

"python.defaultInterpreterPath": "${workspaceFolder}/../nvda/.venv/scripts/python.exe"
}
2 changes: 0 additions & 2 deletions .vscode/typings/__builtins__.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
def _(msg: str) -> str: ...
def pgettext(context: str, message: str) -> str: ...
def ngettext(msgid1: str, msgid2: str, n: int) -> str: ...
def npgettext(context: str, msgid1: str, msgid2: str, n: int) -> str: ...
2 changes: 1 addition & 1 deletion addon/doc/ar/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ bookmarks.

## مستجدات الإصدار 4.0 ##
* إزالة معرف الجزيآت باسم ملف العلامة المرجعية, والتي كانت تتسبب في حدوث بعض
المشكلات مع إضافة فيرفوكس ePUBREADER
المشكلات مع إضافة فيرفوكس ePUBREADER
* إمكانية الوصول لملف المساعدة الخاص بالإضافة من مدير الإضافات البرمجية

## مستجدات الإصدار 3.1 ##
Expand Down
1 change: 0 additions & 1 deletion addon/doc/bg/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -237,4 +237,3 @@ Bookmark&Search, разработени от същия автор. Трябва
испански, словашки, словенски, Тамил.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/da/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,3 @@ placemarkers.
slovakisk, slovensk og tamilsk.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/de/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,4 +243,3 @@ empfielt sich daher stattdessen Suchanfragen zu verwenden.
Portugiesisch, Spanisch, Slovakisch, Slovenisch, Tamil.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/es/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,3 @@ y no las marcas.
Portugués del Brasil, Tamil.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/fi/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,3 @@ paikkamerkkien asemesta sivukohtaista hakua.
ja tamili.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/fr/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -248,4 +248,3 @@ spécifique, pas les marqueurs.
Slovaque, Slovène, Tamil.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/gl/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,3 @@ placemarkers.
Xaponés.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/hr/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,3 @@ placemarkers.
španjolski, slovački, slovenski, tamilski.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/it/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -235,4 +235,3 @@ placemarkers.
spagnolo, slovacco, sloveno, tamil.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/ja/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,4 +178,3 @@ placemarkers.
ブラジルポルトガル語、ファルシ(ペルシア)語、フィンランド語、フランス語、ガリシア語、ドイツ語、イタリア語、日本語、韓国語、ネパール語、ポルトガル語、スペイン語、スロバキア語、スロベニア語、タミル語。

[[!tag dev stable]]

2 changes: 1 addition & 1 deletion addon/doc/ne/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ bookmarks.
* योजना वाचनलाई थप गरियो ।

## २.0 मा गरिएका परिवर्तनहरू ##
* हरेक फाइलमा भएका विभिन्न खोजीलाइ मेटाउन र बचत गर्ने विकल्पहरू थप गरियो ।
* हरेक फाइलमा भएका विभिन्न खोजीलाइ मेटाउन र बचत गर्ने विकल्पहरू थप गरियो ।
* गैर ल्याटीन वर्णहरू भएका मार्ग हुदाँ काटिने समस्या हल गरियो ।
* अब नेत्रवाणीको लगानीसङ्केत पातो प्रयोग गरेर द्रुतमार्ग कायम गर्न सक्ने
बनाइयो ।
Expand Down
1 change: 0 additions & 1 deletion addon/doc/pl/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,4 +227,3 @@ placemarkers.
hiszpański, słowacki, słoweński, tamilski.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/pt_BR/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,4 +238,3 @@ marcadores de posição.
Brasileiro, Tâmil.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/pt_PT/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,3 @@ placemarkers.
eslovaco, esloveno, tamil.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/ro/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,3 @@ placemarkers.
Spaniolă, Slovacă, Slovenă, Tamilă.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/ru/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,4 +227,3 @@ placemarkers.
португальский, испанский, словацкий, словенский, тамильский.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/sk/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,3 @@ placemarkers.
Perzština, Portugalčina, španielčina, slovenčina, slovinčina, Tamilčina.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/tr/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,4 +219,3 @@ sayfalarda, yer imlerini değil, belirli aramayı kullanmak daha iyidir.
Portekizcesi, Farsça, Fince.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/uk/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,3 @@ placemarkers.
португальську, іспанську, словацьку, словенську, тамільську.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/vi/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,4 +219,3 @@ placemarkers.
Slovenia, Nam Ấn Độ.

[[!tag dev stable]]

1 change: 0 additions & 1 deletion addon/doc/zh_CN/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,3 @@
* 翻译为:巴西葡萄牙语,波斯语,芬兰语,法语,加利西亚语,德语,意大利语,日语,韩语,尼泊尔语,葡萄牙语,西班牙语,斯洛伐克语,斯洛维尼亚语,泰米尔语。

[[!tag dev stable]]

Loading
Loading