Skip to content
Snippets Groups Projects
Commit e98b30dc authored by Simon Mazenoux's avatar Simon Mazenoux
Browse files

Merge branch 'dev' into 'master'

Merge Dev into master

See merge request !416
parents 60410c01 cd0c8034
Branches master
Tags 1.8.6
1 merge request!416Merge Dev into master
Pipeline #10049629 passed with stage
in 5 minutes and 47 seconds
Showing
with 23 additions and 17 deletions
......@@ -3,7 +3,7 @@
/dist/*
/venv/*
/.idea/*
/lhcsmapi.egg-info/*
/src/lhcsmapi.egg-info
/.pytest_cache/*
*.pyc
vcs.xml
......
......@@ -3,8 +3,6 @@ include:
file: acc_py_devtools/templates/gitlab-ci/python.yml
variables:
test_folder: test
project_name: lhcsmapi
PY_VERSION: "3.9"
default:
......@@ -38,7 +36,7 @@ doctest:
- apt-get install -y openjdk-11-jdk
- pip install .
- pip install pytest tabulate
- pytest lhcsmapi --doctest-modules --doctest-continue-on-failure
- pytest --doctest-modules --doctest-continue-on-failure --ignore test
unit_tests_pyproject_requirements:
stage: tests
......@@ -53,7 +51,7 @@ unit_tests_pyproject_requirements:
- pip install .
- pip list
- pip install pytest
- pytest ${project_root}/${test_folder} --ignore ${project_root}/${test_folder}/integration
- pytest --ignore test/integration
unit_tests_swan_requirements:
stage: tests
......@@ -76,7 +74,7 @@ unit_tests_swan_requirements:
- pip install -r test-requirements.txt
- pip install pytest pytest-cov
- pip list
- pytest ${project_root}/${test_folder} --ignore ${project_root}/${test_folder}/integration --cov-report term --cov-report xml:cov.xml --cov=${project_name} --junitxml=report.xml
- pytest --ignore test/integration --cov-report term --cov-report xml:cov.xml --cov=lhcsmapi --junitxml=report.xml
integration_tests:
......@@ -99,8 +97,7 @@ integration_tests:
- pip install --upgrade pip
- pip install .
- pip install pytest pytest-cov
- echo ${project_root}
- pytest ${project_root}/${test_folder}/integration --cov-report term --cov-report xml:cov.xml --cov=${project_name} --junitxml=report.xml
- pytest test/integration --cov-report term --cov-report xml:cov.xml --cov=lhcsmapi --junitxml=report.xml
mypy:
......
File deleted
......@@ -3,9 +3,9 @@ requires = ["setuptools>=64", "wheel", "setuptools_scm>=8"]
build-backend = "setuptools.build_meta"
[project]
name="lhcsmapi"
authors=[{name = "TE-MPE", email = "lhc-signal-monitoring@cern.ch"}]
description="A package with an API for signal access and processing for the LHC Signal Monitoring project."
name = "lhcsmapi"
authors = [{ name = "TE-MPE", email = "lhc-signal-monitoring@cern.ch" }]
description = "A package with an API for signal access and processing for the LHC Signal Monitoring project."
readme = "README.md"
requires-python = ">=3.9"
license = { file = "LICENSE" }
......@@ -35,7 +35,7 @@ dependencies = [
"scikit-learn",
"scipy",
"tqdm",
"tzlocal<3.0", # https://its.cern.ch/jira/browse/SIGMON-169
"tzlocal<3.0", # https://its.cern.ch/jira/browse/SIGMON-169
# since version 3.0 the API has changed, tzlocal no longer returns pytz, but zoneinfo
]
dynamic = ["version"]
......@@ -44,9 +44,6 @@ dynamic = ["version"]
"Documentation" = "https://sigmon.docs.cern.ch/"
"Repository" = "https://gitlab.cern.ch/LHCData/lhc-sm-api"
[tool.setuptools.packages]
find = {}
[tool.setuptools_scm]
[tool.black]
......@@ -59,7 +56,15 @@ target-version = "py39"
include = ["pyproject.toml", "lhcsmapi/api/**/*.py"]
[tool.ruff.lint]
select = ["B", "E", "F", "W", "I", "UP", "SIM"] # see https://docs.astral.sh/ruff/rules/
select = [
"B",
"E",
"F",
"W",
"I",
"UP",
"SIM",
] # see https://docs.astral.sh/ruff/rules/
ignore = ["B028"]
[tool.coverage.report]
......@@ -71,4 +76,8 @@ exclude_also = [
[tool.mypy]
ignore_missing_imports = true
files = ["lhcsmapi/api/"]
files = ["src/lhcsmapi/api/"]
[tool.pytest.ini_options]
addopts = ["--import-mode=importlib"]
pythonpath = "src"
File moved
File moved
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment