Skip to content

Commit

Permalink
Merge branch 'main' into add-parallel-schema-validation-runs
Browse files Browse the repository at this point in the history
  • Loading branch information
petechd authored Oct 14, 2024
2 parents 474d8bf + 8643b10 commit 1333257
Show file tree
Hide file tree
Showing 7 changed files with 1,283 additions and 776 deletions.
16 changes: 16 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[flake8]
exclude = tests/*
max-line-length = 160
inline-quotes = double
multiline-quotes = double
docstring-quotes = double
avoid-escape = True
ignore =
# Multiple statements of a function definition should be on their own separate lines
E704,

# Line breaks should occur after the binary operator to keep all variable names aligned
W503,

# Colons should not have any space before them
E203,
9 changes: 2 additions & 7 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,14 @@ limit-inference-results=100

# List of plugins (as comma separated values of python module names) to load,
# usually to register additional checkers.
load-plugins=pylint.extensions.mccabe,pylint_quotes
load-plugins=pylint.extensions.mccabe

# Pickle collected data for later comparisons.
persistent=yes

# Minimum Python version to use for version dependent checks. Will default to
# the version used to run pylint.
py-version=3.11
py-version=3.12

# Discover python modules and packages in the file system subtree.
recursive=no
Expand Down Expand Up @@ -344,11 +344,6 @@ single-line-class-stmt=no
# else.
single-line-if-stmt=no

string-quote=double-avoid-escape
triple-quote=double
docstring-quote=double


[IMPORTS]

# List of modules that can be imported at any level, not just the top level
Expand Down
2 changes: 1 addition & 1 deletion .python-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.11.4
3.12.6
375 changes: 155 additions & 220 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ description = "Questionnaire Schemas Repository"
authors = ["ONSDigital"]

[tool.poetry.dependencies]
python = "^3.11"
python = "^3.12"
coloredlogs = "*"
eq-translations = {git = "https://github.com/ONSDigital/eq-translations.git", rev = "v4.9.2"}
eq-translations = {git = "https://github.com/ONSDigital/eq-translations.git", rev = "v4.10.0"}

[tool.poetry.dev-dependencies]
black = "*"
isort = "*"
pylint = "*"
pylint_quotes = "*"
flake8-quotes = "*"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down
Loading

0 comments on commit 1333257

Please sign in to comment.