Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintenance Update #17

Merged
merged 9 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/_code_quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
options: '--check --diff'
src: '.'
jupyter: true
version: '==23.12'
version: '==24.1'

ruff:
runs-on: ubuntu-latest
Expand All @@ -27,7 +27,7 @@ jobs:
- name: Install dependencies
run: pip install -r requirements.txt
- name: Install ruff
run: pip install ruff==0.1.8
run: pip install ruff==0.2.1
- name: Run ruff
run: ruff .

Expand All @@ -45,6 +45,6 @@ jobs:
pip install -r requirements.txt
pip install pytest
- name: Install pyright
run: pip install pyright==1.1.338
run: pip install pyright==1.1.350
- name: Run pyright
run: pyright .
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e

## [Unreleased]

### Dependencies
* updated to black[jupyter]==24.1 (from black[jupyter]==23.12)
* updated to version: '==24.1' (from version: '==23.12')
* updated to ruff==0.2.1 (from ruff==0.1.8)
* updated to pyright==1.1.350 (from pyright==1.1.338)
* updated to sourcery==1.15 (from sourcery==1.14)
* updated to lxml>=5.1 (from lxml>=4.9)

* -/-


Expand Down
12 changes: 7 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ exclude = [
"./docs/source/conf.py",
]
src = ["src"]
line-length = 120
target-version = "py39"

[tool.ruff.lint]
ignore = [
"E501", # Line length too long
"D100", # Missing docstring in public module
Expand All @@ -35,7 +39,6 @@ ignore = [
# "N816", # Variable in global scope should not be mixedCase (uncomment if you want to allow mixedCase variable names in global scope)
"N999", # Invalid module name
]
line-length = 120
select = [
"E",
"D",
Expand All @@ -45,19 +48,18 @@ select = [
"I",
"B",
]
target-version = "py39"

[tool.ruff.pep8-naming]
[tool.ruff.lint.pep8-naming]
ignore-names = [
"test_*",
"setUp",
"tearDown",
]

[tool.ruff.pydocstyle]
[tool.ruff.lint.pydocstyle]
convention = "numpy"

[tool.ruff.per-file-ignores]
[tool.ruff.lint.per-file-ignores]
"__init__.py" = ["I001"]
"./tests/*" = ["D"]

Expand Down
8 changes: 4 additions & 4 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
pytest>=7.4
pytest-cov>=4.1
black[jupyter]==23.12
ruff==0.1.8
pyright==1.1.338
black[jupyter]==24.1
ruff==0.2.1
pyright==1.1.350
Sphinx>=7.2
sphinx-argparse-cli>=1.11
myst-parser>=2.0
furo>=2023.9.10
sourcery==1.14
sourcery==1.15

-r requirements.txt
-r requirements-types.txt
2 changes: 1 addition & 1 deletion requirements-types.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
types-lxml>=2023.10.21
types-lxml>=5.1
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
lxml>=4.9
lxml>=5.1
jsonschema>=4.20
numpy>=1.26
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ packages = find:
include_package_data = True
python_requires = >=3.9
install_requires =
lxml>=4.9
lxml>=5.1
jsonschema>=4.20
numpy>=1.26

Expand Down
4 changes: 3 additions & 1 deletion tests/test_dictWriter.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ def test_write_dict():
"_commands": {"ls": ["echo %PATH%", "dir"]},
},
}
test_str: str = r"/*---------------------------------*- C++ -*----------------------------------*\ filetype dictionary; coding utf-8; version 0.1; local --; purpose --; \*----------------------------------------------------------------------------*/ param1 -10.0; param2 0.0; param3 0.0; _case { _layer lhsvar; _level 1; _no_of_samples 108; _index 0; _path 'C:\Users\CLAROS\Documents\SystemSimulation\ModelVerification\tools\farn\test\cases\gp_0\lhsvar_000'; _key lhsvar_000; _is_leaf false; _condition NULL; _names ( param1 param2 param3 ); _values ( -10.0 0.0 0.0 ); _commands { ls ( 'echo %PATH%' dir ); } } "
test_str: str = (
r"/*---------------------------------*- C++ -*----------------------------------*\ filetype dictionary; coding utf-8; version 0.1; local --; purpose --; \*----------------------------------------------------------------------------*/ param1 -10.0; param2 0.0; param3 0.0; _case { _layer lhsvar; _level 1; _no_of_samples 108; _index 0; _path 'C:\Users\CLAROS\Documents\SystemSimulation\ModelVerification\tools\farn\test\cases\gp_0\lhsvar_000'; _key lhsvar_000; _is_leaf false; _condition NULL; _names ( param1 param2 param3 ); _values ( -10.0 0.0 0.0 ); _commands { ls ( 'echo %PATH%' dir ); } } "
)
test_cpp_dict: CppDict = CppDict()
test_cpp_dict.update(test_dict)

Expand Down
Loading