Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
DP3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mattia Mancini
DP3
Commits
af809399
Commit
af809399
authored
11 months ago
by
Maik Nijhuis
Browse files
Options
Downloads
Patches
Plain Diff
Fix black version to 24.x / Support pytest 8.0
parent
740d8703
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+8
-0
8 additions, 0 deletions
CMakeLists.txt
ddecal/test/integration/tDDECal.py
+6
-4
6 additions, 4 deletions
ddecal/test/integration/tDDECal.py
docker/ubuntu_22_04_base
+1
-1
1 addition, 1 deletion
docker/ubuntu_22_04_base
with
15 additions
and
5 deletions
CMakeLists.txt
+
8
−
0
View file @
af809399
...
...
@@ -1003,9 +1003,15 @@ if(BUILD_TESTING)
string
(
REGEX REPLACE
".*
${
TEST
}
.py::"
""
PYTEST
${
PYTEST
}
)
add_test
(
NAME
${
TEST
}
::
${
PYTEST
}
# Without the explicit --rootdir argument, pytest uses
# ${CMAKE_SOURCE_DIR} as root directory. pytest >= 8.0 then tries
# loading ${CMAKE_SOURCE_DIR}/pythondp3/__init__.py and fails,
# since it only works in the the pseudo install directory created
# by pythondp3/CMakeLists.txt.
COMMAND
python3 -m pytest --exitfirst -v -k
${
PYTEST
}
--junitxml=
${
CMAKE_BINARY_DIR
}
/pytest_
${
TEST
}
_
${
PYTEST
}
.xml
--rootdir=
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
TEST
}
.py
)
set_tests_properties
(
${
TEST
}
::
${
PYTEST
}
PROPERTIES LABELS
"
${
LABELS
}
"
)
endforeach
()
...
...
@@ -1013,9 +1019,11 @@ if(BUILD_TESTING)
# Create one ctest for all sub-tests in a python test file.
add_test
(
NAME
${
TEST
}
# The comment in add_test above explains why --rootdir is needed.
COMMAND
python3 -m pytest --exitfirst -v
--junitxml=
${
CMAKE_BINARY_DIR
}
/pytest_
${
TEST
}
.xml
--rootdir=
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
TEST
}
.py
)
set_tests_properties
(
${
TEST
}
PROPERTIES LABELS
"
${
LABELS
}
"
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
ddecal/test/integration/tDDECal.py
+
6
−
4
View file @
af809399
...
...
@@ -731,10 +731,12 @@ def test_dd_solution_intervals(solutions_per_direction):
]
try
:
check_output
(
base_command
if
solutions_per_direction
is
None
else
base_command
+
[
f
"
ddecal.solutions_per_direction=
{
solutions_per_direction
}
"
],
(
base_command
if
solutions_per_direction
is
None
else
base_command
+
[
f
"
ddecal.solutions_per_direction=
{
solutions_per_direction
}
"
]
),
stderr
=
STDOUT
,
)
except
CalledProcessError
as
e
:
...
...
This diff is collapsed.
Click to expand it.
docker/ubuntu_22_04_base
+
1
−
1
View file @
af809399
...
...
@@ -78,7 +78,7 @@ RUN wget -nv -O /WSRT_Measures.ztar ftp://ftp.astron.nl/outgoing/Measures/WSRT_M
&& rm /WSRT_Measures.ztar
# Install pip dependencies
RUN pip3 install \
black \
black
~=24.0
\
cmake-format \
h5py \
pytest \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment