Skip to content

Commit a6b2bc9

Browse files
author
Matthieu HONEL
committed
Merge branch 'feature/python-max-3.12' into 'develop'
[Implement #68] Python max 3.12 See merge request research-and-development/ywh2bugtracker!77
2 parents 54ce6ff + 6c0a369 commit a6b2bc9

146 files changed

Lines changed: 9046 additions & 8342 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.

.flake8

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[flake8]
2-
htmltitle = ywh2bt: flake8 violations
2+
htmltitle = ywh2bt: flake8
33
max-line-length = 120
44
max-line-complexity = 15
55
max-cognitive-score = 20
@@ -14,29 +14,19 @@ max-arguments = 12
1414
max-attributes = 10
1515
max-local-variables = 15
1616
max-raises = 5
17+
enable-extensions = G
1718
rst-roles =
1819
class,
1920
func,
2021
ref,
2122
ignore =
2223
# docstring
2324
I,
25+
E203,
2426
N804,
2527
S106,
2628
W503,
2729
W504,
28-
WPS110,
29-
WPS111,
30-
WPS204,
31-
WPS226,
32-
WPS237,
33-
WPS305,
34-
WPS306,
35-
WPS322,
36-
WPS338,
37-
WPS432,
38-
WPS601,
39-
WPS615,
4030

4131
exclude =
4232
ywh2bt/gui/resources.py

.gitignore

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,6 @@
11
# PyCharm
22
# User-specific stuff
3-
.idea/**/workspace.xml
4-
.idea/**/tasks.xml
5-
.idea/**/usage.statistics.xml
6-
.idea/**/dictionaries
7-
.idea/**/shelf
8-
9-
# Generated files
10-
.idea/**/contentModel.xml
11-
12-
# Sensitive or high-churn files
13-
.idea/**/dataSources/
14-
.idea/**/dataSources.ids
15-
.idea/**/dataSources.local.xml
16-
.idea/**/sqlDataSources.xml
17-
.idea/**/dynamic.xml
18-
.idea/**/uiDesigner.xml
19-
.idea/**/dbnavigator.xml
20-
.idea/runConfigurations/sync_*.xml
3+
.idea/
214

225
.venv
236
.pypoetry

.gitlab-ci.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: python:3.9
1+
image: python:3.11
22

33
variables:
44
PIP_CACHE_DIR: "${CI_PROJECT_DIR}/.cache/pip"
@@ -15,6 +15,7 @@ cache:
1515
paths:
1616
- .cache/pip
1717
- .cache/poetry
18+
- .cache/pyenv
1819

1920
stages:
2021
- verify
@@ -26,8 +27,9 @@ stages:
2627
tags:
2728
- docker20
2829
before_script:
29-
- pip install poetry
30-
- poetry install --no-root
30+
- curl -sSL https://install.python-poetry.org | python -
31+
- export PATH="/root/.local/bin:$PATH"
32+
- poetry install --no-root --with dev
3133

3234
.base_docker:
3335
tags:
@@ -54,6 +56,12 @@ Flake8 code style check:
5456
- build/flake8
5557
expire_in: 1 day
5658

59+
Check Formatting:
60+
stage: verify
61+
extends: .base_poetry
62+
script:
63+
- make format-check
64+
5765
Static type check:
5866
stage: verify
5967
extends: .base_poetry
@@ -72,8 +80,9 @@ Unit tests:
7280
- if [ ! -d "${PYENV_ROOT}" ]; then curl https://pyenv.run | sh; fi
7381
- export PATH="${PYENV_ROOT}/bin:$PATH"
7482
- eval "$(pyenv init -)"
83+
- eval "$(pyenv virtualenv-init -)"
7584
- pyenv update
76-
- cat .python-version | xargs -n1 pyenv install -s
85+
- cat .python-version | xargs -n1 pyenv install -sk
7786
- make tox
7887

7988
User Guide Check:

.idea/.gitignore

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

.idea/codeStyles/Project.xml

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

.idea/codeStyles/codeStyleConfig.xml

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

.idea/inspectionProfiles/Project_Default.xml

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

.idea/inspectionProfiles/profiles_settings.xml

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

.idea/misc.xml

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

.idea/modules.xml

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

0 commit comments

Comments
 (0)