Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from nvaccess:master #87

Merged
merged 3 commits into from
Aug 6, 2024
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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ci:
# Can't run Windows scripts on Linux
# These also do not apply fixes, only run tests
skip: [scons-source, checkPot, unitTest, licenseCheck]
submodules: true
autoupdate_schedule: monthly
autoupdate_commit_msg: "Pre-commit auto-update"
autofix_commit_msg: "Pre-commit auto-fix"

Expand Down Expand Up @@ -36,7 +36,7 @@ repos:

- repo: https://github.com/astral-sh/ruff-pre-commit
# Matches Ruff version in requirements.
rev: v0.5.5
rev: v0.5.6
hooks:
- id: ruff
name: lint with ruff
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ sphinx==7.2.6
sphinx_rtd_theme==1.3.0

# Requirements for automated linting
ruff==0.5.5
ruff==0.5.6
pre-commit==3.7.1

# Runing automated license checks
Expand Down
38 changes: 22 additions & 16 deletions tests/unit/test_speech.py
Original file line number Diff line number Diff line change
Expand Up @@ -526,12 +526,14 @@ def test_decomposed_normalizeOnReport(self):
self.assertEqual(repr(list(output)), expected)

def test_normalizedInSymbolDict_normalizeOff(self):
expected = repr([
'·',
EndUtteranceCommand(),
])
expected = repr(
[
"·",
EndUtteranceCommand(),
],
)
output = _getSpellingSpeechWithoutCharMode(
text='·',
text="·",
locale="en",
useCharacterDescriptions=False,
sayCapForCapitals=False,
Expand All @@ -543,12 +545,14 @@ def test_normalizedInSymbolDict_normalizeOff(self):
self.assertEqual(repr(list(output)), expected)

def test_normalizedInSymbolDict_normalizeOnDontReport(self):
expected = repr([
processSpeechSymbol("en", "·"),
EndUtteranceCommand(),
])
expected = repr(
[
processSpeechSymbol("en", "·"),
EndUtteranceCommand(),
],
)
output = _getSpellingSpeechWithoutCharMode(
text='·',
text="·",
locale="en",
useCharacterDescriptions=False,
sayCapForCapitals=False,
Expand All @@ -560,13 +564,15 @@ def test_normalizedInSymbolDict_normalizeOnDontReport(self):
self.assertEqual(repr(list(output)), expected)

def test_normalizedInSymbolDict_normalizeOnReport(self):
expected = repr([
processSpeechSymbol("en", "·"),
' normalized',
EndUtteranceCommand(),
])
expected = repr(
[
processSpeechSymbol("en", "·"),
" normalized",
EndUtteranceCommand(),
],
)
output = _getSpellingSpeechWithoutCharMode(
text='·',
text="·",
locale="en",
useCharacterDescriptions=False,
sayCapForCapitals=False,
Expand Down
2 changes: 1 addition & 1 deletion user_docs/en/changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Please refer to [the developer guide](https://www.nvaccess.org/files/nvda/docume
* Component updates:
* Updated py2exe to 0.13.0.2 (#16907, @dpy013)
* Updated setuptools to 72.0 (#16907, @dpy013)
* Updated Ruff to 0.5.5. (#16868, @LeonarddeR)
* Updated Ruff to 0.5.6. (#16868, @LeonarddeR)
* Added a `.editorconfig` file to NVDA's repository in order for several IDEs to pick up basic NVDA code style rules by default. (#16795, @LeonarddeR)
* Added support for custom speech symbol dictionaries. (#16739, #16823, @LeonarddeR)
* Dictionaries can be provided in locale specific folders in an add-on package, e.g. `locale\en`.
Expand Down
12 changes: 6 additions & 6 deletions user_docs/en/userGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ Major highlights include:

### System Requirements {#SystemRequirements}

#### Recommended System Requirements {#MinimumSystemRequirements}
* Operating Systems: 64-bit editions of Windows 10, Windows 11, and Window Server 2022
* both AMD64 and ARM64 variants of Windows are supported.
* at least 150 MB of storage space.
* at least 4 GB of RAM.

#### Minimum System Requirements {#MinimumSystemRequirements}
* Operating Systems: all 32-bit and 64-bit editions of Windows 8.1, Windows 10, Windows 11, and all Server Operating Systems starting from Windows Server 2012 R2.
* both AMD64 and ARM64 variants of Windows are supported.
* Note 32-bit operating systems are no longer under active support.
* Note that Windows 8.1 and Windows Server versions older than 2022 are no longer under active support.
* at least 150 MB of storage space.

#### Recommended System Requirements {#RecommendedSystemRequirements}
* Operating Systems: 64-bit editions of Windows 10, Windows 11, and Window Server 2022
* both AMD64 and ARM64 variants of Windows are supported.
* at least 150 MB of storage space.
* at least 4 GB of RAM.

### Internationalization {#Internationalization}

It is important that people anywhere in the world, no matter what language they speak, get equal access to technology.
Expand Down
Loading