Skip to content

Commit ff3342a

Browse files
michaelDCurranmichaelDCurran
authored
Merge 90a7183 into e5d62e3 
2 parents e5d62e3 + 90a7183 commit ff3342a

File tree

24 files changed

+64
-174
lines changed

24 files changed

+64
-174
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,12 @@
1515
path = include/sonic
1616
url = https://github.com/waywardgeek/sonic.git
1717
ignore = untracked
18-
[submodule "include/pyserial"]
19-
path = include/pyserial
20-
url = https://github.com/pyserial/pyserial.git
21-
ignore = untracked
22-
[submodule "include/comtypes"]
23-
path = include/comtypes
24-
url = https://github.com/nvaccess/comtypes-bin
25-
[submodule "include/scons"]
26-
path = include/scons
27-
url = https://github.com/SCons/scons
2818
[submodule "include/ia2"]
2919
path = include/ia2
3020
url = https://github.com/LinuxA11y/IAccessible2.git
31-
[submodule "include/wxPython"]
32-
path = include/wxPython
33-
url = https://github.com/nvaccess/wxPython-bin.git
3421
[submodule "include/configobj"]
3522
path = include/configobj
3623
url = https://github.com/DiffSK/configobj.git
37-
[submodule "include/py2exe"]
38-
path = include/py2exe
39-
url = https://github.com/nvaccess/py2exe-bin
4024
[submodule "include/javaAccessBridge32"]
4125
path = include/javaAccessBridge32
4226
url = https://github.com/nvaccess/javaAccessBridge32-bin.git

‎appveyor.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ branches:
1111
- /release-.*/
1212

1313
environment:
14-
PY_PYTHON: 3.7-32
14+
PY_PYTHON: 3.8-32
1515
encFileKey:
1616
secure: ekOvuyywHuDdGZmRmoj+b3jfrq39A2xlx4RD5ZUGd/8=
1717
mozillaSymsAuthToken:
@@ -59,6 +59,16 @@ init:
5959
clone_depth: 1
6060

6161
install:
62+
# Ensure we have the latest version of pip
63+
- py -m pip install --upgrade pip
64+
# Create a Python virtual environment
65+
- py -3.8-32 -m venv .venv
66+
# Activate the virtual environment
67+
- .venv\scripts\activate.bat
68+
# Install all required Python packages
69+
- py -m pip install -r requirements.txt
70+
# Save an exact list of the actual Python packages and their versions that got installed, to aide in reproducing a build
71+
- py -m pip freeze >output\pip_packages.txt
6272
- cd appveyor
6373
# Decrypt files.
6474
- ps: |
@@ -95,12 +105,12 @@ build_script:
95105
Set-AppveyorBuildVariable "sconsOutTargets" $sconsOutTargets
96106
Set-AppveyorBuildVariable "sconsArgs" $sconsArgs
97107
- 'echo scons args: %sconsArgs%'
98-
- py scons.py source %sconsArgs%
108+
- scons source %sconsArgs%
99109
# We don't need launcher to run checkPot, so run the checkPot before launcher.
100-
- py scons.py checkPot %sconsArgs%
110+
- scons checkPot %sconsArgs%
101111
# The pot gets built by tests, but we don't actually need it as a build artifact.
102112
- 'echo scons output targets: %sconsOutTargets%'
103-
- py scons.py %sconsOutTargets% %sconsArgs%
113+
- scons %sconsOutTargets% %sconsArgs%
104114
# Build symbol store.
105115
- ps: |
106116
foreach ($syms in
@@ -118,9 +128,6 @@ build_script:
118128
- cd ..
119129

120130
before_test:
121-
# install required packages
122-
- py -m pip install --upgrade pip
123-
- py -m pip install -r tests/system/requirements.txt -r tests/lint/lintInstall/requirements.txt
124131
- mkdir testOutput
125132
- mkdir testOutput\unit
126133
- mkdir testOutput\system

‎devDocs/devDocsInstall/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎devDocs/devDocsInstall/requirements.txt‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎devDocs/devDocsInstall/sconscript‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎devDocs/sconscript‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ Import("env", "outputDir", "sourceDir", "t2tBuildConf")
1919

2020
env = env.Clone()
2121

22-
devDocsInstall = env.SConscript("devDocsInstall/sconscript", exports=["env"])
23-
env.Depends(devDocsInstall, env.Dir("devDocs/devDocsInstall/requirements.txt"))
24-
env.Alias("devDocsInstall", devDocsInstall)
25-
2622
devDocsOutputDir=outputDir.Dir('devDocs')
2723

2824
#Build the developer guide and move it to the output directory
@@ -69,7 +65,6 @@ sphinxAPIDocs = env.Command(
6965
] + [f"{sourceDir}\\{f}" for f in ignorePaths]
7066
]
7167
)
72-
env.Depends(sphinxAPIDocs, devDocsInstall)
7368
sphinxHtml = env.Command(
7469
"_build",
7570
sphinxAPIDocs,

‎include/comtypes‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/py2exe‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/pyserial‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎include/scons‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)