Skip to content

Commit 3e6f86e

Browse files
StevenSchlechteStevenSchlechte
committed
Merge branch 'main' into bug/8925-if-there-is-a-problem-with-saving-the-otconfig-file-the-error-message-is-not-shown-in-the-ui
2 parents ec39df5 + 22353d2 commit 3e6f86e

216 files changed

Lines changed: 3379 additions & 1726 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/benchmark.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ jobs:
4040
- name: Install the project
4141
shell: bash
4242
run: uv sync --locked --dev
43-
- name: Run regression tests
44-
run: uv run pytest ./tests/benchmark_otanalytics.py --benchmark-json output.json
43+
- name: Run benchmark tests
44+
run: uv run pytest ./tests/benchmark --benchmark-json output.json
4545
- name: Store benchmark result
4646
uses: benchmark-action/github-action-benchmark@v1
4747
with:

‎.github/workflows/regression-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ jobs:
3939
shell: bash
4040
run: uv sync --locked --dev
4141
- name: Run regression tests
42-
run: uv run pytest ./tests/regression_otanalytics.py
42+
run: uv run pytest ./tests/regression

‎.github/workflows/release-pypi.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
run: uv build --out-dir ${{ env.out_dir }}
5151

5252
- name: Store the distribution packages
53-
uses: actions/upload-artifact@v5
53+
uses: actions/upload-artifact@v6
5454
with:
5555
name: python-package-distributions
5656
path: ${{ env.out_dir }}

‎.github/workflows/release-testpypi.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
run: uv build --out-dir ${{ env.out_dir }}
7373

7474
- name: Store the distribution packages
75-
uses: actions/upload-artifact@v5
75+
uses: actions/upload-artifact@v6
7676
with:
7777
name: python-package-distributions
7878
path: ${{ env.out_dir }}

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ jobs:
3131
with:
3232
py-version: ${{ matrix.py }}
3333
package-path: OTAnalytics
34-
test-path: tests/OTAnalytics
34+
test-path: tests/unit

‎.pre-commit-config.yaml‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,67 +14,64 @@ repos:
1414
- id: requirements-txt-fixer
1515
- id: check-executables-have-shebangs
1616
- id: detect-private-key
17-
- repo: local
17+
- repo: https://github.com/OpenTrafficCam/dependency-update-pre-commit
18+
rev: v0.2.0
1819
hooks:
19-
- id: update-type-stubs
20-
name: Check for Type Stubs and Update Config
21-
entry: ./update_precommit.py
22-
language: system
23-
files: ^requirements.*\.txt$
24-
stages:
25-
- pre-commit
20+
- id: update-mypy-dependencies
2621
- repo: https://github.com/PyCQA/flake8
2722
rev: 7.3.0
2823
hooks:
2924
- id: flake8
25+
- repo: https://github.com/psf/black
26+
rev: 24.8.0
27+
hooks:
28+
- id: black
3029
- repo: https://github.com/pycqa/isort
3130
rev: 5.13.2
3231
hooks:
3332
- id: isort
3433
args:
3534
- --profile
3635
- black
37-
- repo: https://github.com/psf/black
38-
rev: 24.8.0
39-
hooks:
40-
- id: black
4136
- repo: https://github.com/pre-commit/mirrors-mypy
4237
rev: v1.16.1
4338
hooks:
4439
- id: mypy
4540
entry: mypy OTAnalytics tests --config-file=pyproject.toml
4641
additional_dependencies:
4742
- av==13.0.0
48-
- black==24.8.0
43+
- black==25.1.0
4944
- customtkinter==5.2.2
50-
- fastapi==0.116.2
51-
- hatch-requirements-txt==0.4.1
45+
- fastapi==0.128.0
5246
- ijson==3.3.0
5347
- interrogate==1.7.0
54-
- isort==5.13.2
48+
- isort==6.0.1
5549
- matplotlib==3.10.0
5650
- more-itertools==10.7.0
5751
- mypy==1.16.1
5852
- nicegui==2.24.1
5953
- numpy==2.1.1
6054
- opencv-python-headless==4.10.0.84
61-
- pandas-stubs==2.2.3.241126
55+
- pandas-stubs==2.3.2.250926
6256
- pandas==2.3.3
57+
- playwright==1.55.0
6358
- polars==1.32.3
6459
- pre-commit==4.1.0
6560
- pyarrow==21.0.0
6661
- pytest-asyncio==0.24.0
6762
- pytest-benchmark==5.1.0
68-
- pytest-cov==6.0.0
69-
- pytest-lazy-fixtures==1.1.2
63+
- pytest-cov==7.0.0
64+
- pytest-lazy-fixtures==1.4.0
65+
- pytest-playwright==0.7.1
66+
- pytest-timeout==2.4.0
7067
- pytest==8.3.4
71-
- starlette==0.48.0
72-
- twine==6.1.0
68+
- starlette==0.49.1
69+
- twine==6.2.0
7370
- types-PyYAML
7471
- types-flake8
7572
- types-openpyxl
7673
- types-pillow
77-
- types-pywin32
74+
- types-pywin32; sys_platform == "win32"
7875
- types-requests
7976
- types-seaborn
8077
- types-selenium

‎.run/pytest-acceptance-tests.run.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="pytest-acceptance-tests" type="tests" factoryName="py.test">
3+
<module name="OTAnalytics"/>
4+
<option name="INTERPRETER_OPTIONS" value=""/>
5+
<option name="PARENT_ENVS" value="true"/>
6+
<option name="SDK_HOME" value=""/>
7+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"/>
8+
<option name="IS_MODULE_SDK" value="true"/>
9+
<option name="ADD_CONTENT_ROOTS" value="true"/>
10+
<option name="ADD_SOURCE_ROOTS" value="true"/>
11+
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py"/>
12+
<option name="_new_keywords" value="&quot;&quot;"/>
13+
<option name="_new_parameters" value="&quot;&quot;"/>
14+
<option name="_new_additionalArguments" value="&quot;&quot;"/>
15+
<option name="_new_target" value="&quot;$PROJECT_DIR$/tests/acceptance&quot;"/>
16+
<option name="_new_targetType" value="&quot;PATH&quot;"/>
17+
<method v="2"/>
18+
</configuration>
19+
</component>

‎.run/pytest-benchmark-tests.run.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="pytest-benchmark-tests" type="tests" factoryName="py.test">
3+
<module name="OTAnalytics"/>
4+
<option name="INTERPRETER_OPTIONS" value=""/>
5+
<option name="PARENT_ENVS" value="true"/>
6+
<option name="SDK_HOME" value=""/>
7+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"/>
8+
<option name="IS_MODULE_SDK" value="true"/>
9+
<option name="ADD_CONTENT_ROOTS" value="true"/>
10+
<option name="ADD_SOURCE_ROOTS" value="true"/>
11+
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py"/>
12+
<option name="_new_keywords" value="&quot;&quot;"/>
13+
<option name="_new_parameters" value="&quot;&quot;"/>
14+
<option name="_new_additionalArguments" value="&quot;&quot;"/>
15+
<option name="_new_target" value="&quot;$PROJECT_DIR$/tests/benchmark&quot;"/>
16+
<option name="_new_targetType" value="&quot;PATH&quot;"/>
17+
<method v="2"/>
18+
</configuration>
19+
</component>

‎.run/pytest-regression-tests.run.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="pytest-regression-tests" type="tests" factoryName="py.test">
3+
<module name="OTAnalytics"/>
4+
<option name="INTERPRETER_OPTIONS" value=""/>
5+
<option name="PARENT_ENVS" value="true"/>
6+
<option name="SDK_HOME" value=""/>
7+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"/>
8+
<option name="IS_MODULE_SDK" value="true"/>
9+
<option name="ADD_CONTENT_ROOTS" value="true"/>
10+
<option name="ADD_SOURCE_ROOTS" value="true"/>
11+
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py"/>
12+
<option name="_new_keywords" value="&quot;&quot;"/>
13+
<option name="_new_parameters" value="&quot;&quot;"/>
14+
<option name="_new_additionalArguments" value="&quot;&quot;"/>
15+
<option name="_new_target" value="&quot;$PROJECT_DIR$/tests/regression&quot;"/>
16+
<option name="_new_targetType" value="&quot;PATH&quot;"/>
17+
<method v="2"/>
18+
</configuration>
19+
</component>

‎.run/pytest-unit-tests.run.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="pytest-unit-tests" type="tests" factoryName="py.test">
3+
<module name="OTAnalytics"/>
4+
<option name="INTERPRETER_OPTIONS" value=""/>
5+
<option name="PARENT_ENVS" value="true"/>
6+
<option name="SDK_HOME" value=""/>
7+
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"/>
8+
<option name="IS_MODULE_SDK" value="true"/>
9+
<option name="ADD_CONTENT_ROOTS" value="true"/>
10+
<option name="ADD_SOURCE_ROOTS" value="true"/>
11+
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py"/>
12+
<option name="_new_keywords" value="&quot;&quot;"/>
13+
<option name="_new_parameters" value="&quot;&quot;"/>
14+
<option name="_new_additionalArguments" value="&quot;&quot;"/>
15+
<option name="_new_target" value="&quot;$PROJECT_DIR$/tests/unit&quot;"/>
16+
<option name="_new_targetType" value="&quot;PATH&quot;"/>
17+
<method v="2"/>
18+
</configuration>
19+
</component>

0 commit comments

Comments
 (0)