Skip to content

Commit f5c9965

Browse files
authored
Merge branch 'master' into ui_fix
2 parents 2d046d9 + 66f057a commit f5c9965

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

install/installation.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,7 @@ When the domain is asked during installation, enter the domain name that will ru
130130
131131
### Windows
132132
133-
* Install cygwin (http://cygwin.com/install.html). When cygwin asks which
134-
packages to install, select Python, MySql, and google-api-client. If you
135-
already have cygwin installed, you must run its setup file to install the new packages. Make sure the dropdown menu is set to Full, so you can all packages. To select one, click skip and it will change to the version number of the package. Use the end of [this](https://www.davidbaumgold.com/tutorials/set-up-python-windows/) tutorial for help on getting cygwin to recognize python.
133+
* Install cygwin (http://cygwin.com/install.html). When cygwin asks which packages to install, select Python, MySql, and google-api-client. If you already have cygwin installed, you must run its setup file to install the new packages. Make sure the dropdown menu is set to Full, so you can see all packages. To select one, click skip and it will change to the version number of the package. Use the end of [this](https://www.davidbaumgold.com/tutorials/set-up-python-windows/) tutorial for help on getting cygwin to recognize python.
136134
* Install [WinFsp](https://winfsp.dev/) and [Rclone](https://rclone.org/) from their official websites.
137135
* Now rclone is a command line program, follow the [official documentation](https://rclone.org/googlecloudstorage/) to mount the google cloud storage bucket, using the service account key file.
138136
* By default home directory of Cygwin is `C:\cygwin\home\<USERNAME>\` (this can be obtained by running `cygpath -w ~` from cygwin terminal), and assuming `\repository` to be the location of samples to be configured, mount the bucket using rclone at `C:\cygwin\home\<USERNAME>\repository` through the following command using command prompt:
@@ -185,7 +183,7 @@ After the completion of the automated installation of the platform, the followin
185183
- `TempFiles/` - Directory containing temporary files
186184
- `TestData/` - Directory containing files required for starting a test - runCI files, variables file, tester
187185
- `TestFiles/` - Directory containing regression test samples
188-
- `TestResults/` - Direction containing regression test results
186+
- `TestResults/` - Directory containing regression test results
189187
- `vm_data/` - Directory containing test-specific subfolders, each folder containing files required for testing to be passed to the VM instance, test files and CCExtractor build artefact.
190188
191189
Now for tests to run, we need to download the [CCExtractor testsuite](https://github.com/CCExtractor/ccx_testsuite) release file, extract and put it in the `TestData/ci-linux` and `TestData/ci-windows` folders.
@@ -397,4 +395,4 @@ To setup automated deployments via GitHub workflows, follow these steps:
397395
- Click on "New repository secret" and setup the following variable:
398396
- `SSH_KEY_PRIVATE`: Save the contents of the private SSH key file created in the last step as this secret.
399397
- Also checkout the variables `INSTALL_FOLDER` and `SAMPLE_REPOSITORY` in the [deployment pipeline](/.github/workflows/sp-deployment-pipeline.yml) in case you have configured values other than default.
400-
398+

mod_ci/controllers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class Artifact_names(DeclEnum):
250250
"""Define CCExtractor GitHub Artifacts names."""
251251

252252
linux = "CCExtractor Linux build"
253-
windows = "CCExtractor Windows Release build"
253+
windows = "CCExtractor Windows x64 Release build"
254254

255255

256256
def is_valid_commit_hash(commit: Optional[str]) -> bool:

mod_test/controllers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def get_test_results(test) -> List[Dict[str, Any]]:
9999
# We need to check if the regression test had any file that shouldn't have been ignored.
100100
outputs = RegressionTestOutput.query.filter(and_(
101101
RegressionTestOutput.regression_id == category_test['test'].id,
102-
RegressionTestOutput.ignore is False
102+
RegressionTestOutput.ignore.is_(False)
103103
)).all()
104104
got = None
105105
if len(outputs) > 0:

requirements.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
sqlalchemy==2.0.46
2-
flask==3.1.2
1+
sqlalchemy==2.0.48
2+
flask==3.1.3
33
passlib==1.7.4
44
pymysql==1.1.2
55
python-magic==0.4.27
66
flask-wtf==1.2.2
77
requests==2.32.5
88
pyIsEmail==2.0.1
99
GitPython==3.1.46
10-
xmltodict==1.0.2
10+
xmltodict==1.0.4
1111
lxml==6.0.2
12-
pytz==2025.2
12+
pytz==2026.1.post1
1313
tzlocal==5.3.1
14-
markdown2==2.5.4
14+
markdown2==2.5.5
1515
flask-migrate==4.1.0
1616
email_validator
1717
gitdb==4.0.12
18-
Werkzeug==3.1.5
18+
Werkzeug==3.1.6
1919
WTForms==3.2.1
2020
MarkupSafe==3.0.3
2121
jinja2==3.1.6
2222
itsdangerous==2.2.0
23-
google-api-python-client==2.189.0
23+
google-api-python-client==2.192.0
2424
google-cloud-storage==3.9.0
2525
cffi==2.0.0
2626
PyGithub==2.8.1

templates/test/by_id.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,8 @@ <h4 class="category-header {{ 'fail' if result.error else 'pass' }}" data-catego
153153
{%- endif %}
154154
{% elif file.got is none or no_error.found or test.result.exit_code != 0 -%}
155155
Pass
156+
{% elif file.got == "error" %}
157+
No output generated but there should be
156158
{% else %}
157159
<a href="#" class="diff_link" data-test="{{ file.test_id }}" data-regression="{{ file.regression_test_id }}" data-output="{{ file.regression_test_output_id }}">Fail</a>
158160
{%- endif %}

test-requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
pycodestyle==2.14.0
22
pydocstyle==6.3.0
33
dodgy==0.2.1
4-
isort==7.0.0
4+
isort==8.0.1
55
mypy==1.19.1
66
Flask-Testing==0.8.1
77
nose2-cov==1.0a4
8-
coverage==7.13.3
8+
coverage==7.13.4

0 commit comments

Comments
 (0)