Skip to content

Commit

Permalink
Finalize PDM/Nox/Meson merge request
Browse files Browse the repository at this point in the history
  • Loading branch information
paugier committed Feb 16, 2024
1 parent 5f6dad5 commit 62b4e49
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 71 deletions.
5 changes: 2 additions & 3 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
stages:
# - image-pixi
# - pixi
- image
- lint
Expand Down Expand Up @@ -89,10 +88,10 @@ pages:
- rsync -rvc --delete doc/_build/html/* public/$CI_COMMIT_REF_NAME/
# This directory can become too large leading to error.
# It can be purged with the botton "Clear runner caches"
# in https://foss.heptapod.net/fluiddyn/fluidsim/-/pipelines
# in https://foss.heptapod.net/fluiddyn/fluidimage/-/pipelines
- ls public
- echo "CI_COMMIT_REF_NAME="$CI_COMMIT_REF_NAME
- echo See https://fluiddyn.pages.heptapod.net/fluidsim/$CI_COMMIT_REF_NAME
- echo See https://fluiddyn.pages.heptapod.net/fluidimage/$CI_COMMIT_REF_NAME
artifacts:
name: "$CI_COMMIT_REF_NAME"
paths:
Expand Down
42 changes: 0 additions & 42 deletions create_meson_files.py

This file was deleted.

2 changes: 1 addition & 1 deletion docker/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image := image-fluidsim
image := image-fluidimage
tag := $(shell date -I'date'| tr -d "[:punct:]")

define STR_HELP
Expand Down
1 change: 0 additions & 1 deletion src/fluidimage/calibration/test_calib_cv.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ def test_interpolate(self):
self.calib_cache.get_rotation(2)
self.calib_cache.get_translate(-2)

# @unittest.expectedFailure
def test_calibrate(self):
"""Tests construct_object_points and CalibCV methods."""
path_input = pathbase / "cam0" / "0mm_cam0.tif"
Expand Down
6 changes: 1 addition & 5 deletions src/fluidimage/topologies/surface_tracking.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,7 @@ class TopologySurfaceTracking(TopologyBase):

@classmethod
def create_default_params(cls):
"""Class method returning the default parameters.
For developers: cf. fluidsim.base.params
"""
"""Class method returning the default parameters."""
params = ParamContainer(tag="params")

WorkSurfaceTracking._complete_params_with_default(params)
Expand Down
6 changes: 1 addition & 5 deletions try/experimental/topology/piv.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ class TopologyPIV(TopologyBase):

@classmethod
def create_default_params(cls):
"""Class method returning the default parameters.
For developers: cf. fluidsim.base.params
"""
"""Class method returning the default parameters."""
params = ParamContainer(tag="params")

params._set_child(
Expand Down
6 changes: 1 addition & 5 deletions try/experimental/topology/piv_2.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,7 @@ class TopologyPIV(TopologyBase):

@classmethod
def create_default_params(cls):
"""Class method returning the default parameters.
For developers: cf. fluidsim.base.params
"""
"""Class method returning the default parameters."""
params = ParamContainer(tag="params")

params._set_child(
Expand Down
6 changes: 2 additions & 4 deletions try/experimental/topology/socket_asycncio.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@
#
# # await loop.sock_sendall(client, response.encode('utf8'))
# client.close()
def create_default_params():
"""Class method returning the default parameters.

For developers: cf. fluidsim.base.params

"""
def create_default_params():
"""Class method returning the default parameters."""
params = ParamContainer(tag="params")

params._set_child(
Expand Down
6 changes: 1 addition & 5 deletions try/surface_tracking/topo_old/surface_tracking.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,7 @@ class TopologySurfaceTracking(TopologyBase):

@classmethod
def create_default_params(cls):
"""Class method returning the default parameters.
For developers: cf. fluidsim.base.params
"""
"""Class method returning the default parameters."""
params = ParamContainer(tag="params")

params._set_child(
Expand Down

0 comments on commit 62b4e49

Please sign in to comment.