Merge branch 'master' into master

Author: remichassagne

.gitattributes

@@ -1,3 +1,2 @@
 output_samples/** linguist-vendored
-appveyor/** linguist-vendored
 doc/** linguist-documentation

.github/workflows/build_and_pypi.yml

@@ -7,18 +7,18 @@ jobs:
       # You can use PyPy versions in python-version.
       # For example, pypy-2.7 and pypy-3.8
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     outputs:
       version_changed: ${{ steps.check_file_changed.outputs.files_changed }}
     steps:
-      - run: pip install -U pip pipenv coverage
+      - run: pip install -U pip pipenv coverage build
       - run: pip install -U numpy scipy matplotlib
       - name: Check out repository code
         uses: actions/checkout@v4
       - run: set -o pipefail
       - name: Build and install fluidfoam
         run: |
-          cd ${{ github.workspace }} && python setup.py develop --user
+          cd ${{ github.workspace }} && python -m build && pip install dist/fluidfoam*.whl --user
       - name: Test fluidfoam
         run: make tests
       - name: Test fluidfoam coverage
@@ -28,7 +28,7 @@ jobs:
         with:
           token: ${{ secrets.codecov }}
           fail_ci_if_error: true
-          files: ./.coverage/coverage.xml
+          files: ./coverage.xml
           flags: unittests
           name: codecov-umbrella
           verbose: true        
@@ -44,6 +44,7 @@ jobs:
         uses: casperdcl/deploy-pypi@v2
         with:
           password: ${{ secrets.PYPI_TOKEN }}
-          pip: wheel -w dist/ --no-deps .
+          build: --sdist --wheel --outdir dist .
+          # old version : pip: wheel -w dist/ --no-deps .
           # only upload if a tag is pushed (otherwise just build & check)
           upload: ${{ github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') }}

.github/workflows/build_and_test.yml

@@ -7,18 +7,18 @@ jobs:
       # You can use PyPy versions in python-version.
       # For example, pypy-2.7 and pypy-3.8
       matrix:
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
     outputs:
       version_changed: ${{ steps.check_file_changed.outputs.files_changed }}
     steps:
-      - run: pip install -U pip pipenv coverage
+      - run: pip install -U pip pipenv coverage build
       - run: pip install -U numpy scipy matplotlib
       - name: Check out repository code
         uses: actions/checkout@v4
       - run: set -o pipefail
       - name: Build and install fluidfoam
         run: |
-          cd ${{ github.workspace }} && python setup.py develop --user
+          cd ${{ github.workspace }} && python -m build && pip install dist/fluidfoam*.whl --user
       - name: Test fluidfoam
         run: make tests
       - name: Test fluidfoam coverage

.gitignore

@@ -2,7 +2,6 @@
 syntax: glob
 *pyc
 *~
-.tox
 dist
 fluidfoam.egg-info
 .coverage

.readthedocs.yml

@@ -30,5 +30,5 @@ formats: all
 python:
   install:
     - requirements: doc/requirements.txt
-    - method: setuptools
+    - method: pip
       path: . 

Dockerfile

@@ -23,7 +23,6 @@ RUN /bin/bash -c "git clone https://github.com/fluiddyn/fluidfoam"
 WORKDIR /home/openfoam/fluidfoam
 RUN /bin/bash -c "make"
 RUN /bin/bash -c "make clean"
-RUN /bin/bash -c "python3 setup.py develop"
 
 USER openfoam:openfoam
 # Set the default entry point & arguments

Dockerfile-ci

@@ -23,7 +23,6 @@ RUN /bin/bash -c "git clone https://github.com/fluiddyn/fluidfoam"
 WORKDIR /home/openfoam/fluidfoam
 RUN /bin/bash -c "make"
 RUN /bin/bash -c "make clean"
-RUN /bin/bash -c "python3 setup.py develop"
 
 USER openfoam:openfoam
 # Set the default entry point & arguments

LICENSE.txt LICENSELICENSE.txt renamed to LICENSE

@@ -1,14 +1,12 @@
 
-.PHONY: clean clean_all develop build_ext_inplace
+.PHONY: clean clean_all develop
 
 develop:
-	python setup.py develop
-
-build_ext_inplace:
-	python setup.py build_ext --inplace
+	python -m build
+	pip install dist/fluidfoam*.whl --user
 
 clean:
-	rm -rf build
+	rm -rf dist
 
 tests:
 	python -m unittest discover
@@ -17,7 +15,6 @@ black:
 	black -l 82 fluidfoam
 
 tests_coverage:
-	mkdir -p .coverage
 	coverage run -p -m unittest discover
 	coverage combine
 	coverage report

Makefile

@@ -1,83 +1,70 @@
-========
 fluidfoam
-========
+=========
 
-|release| |docs| |Github-action| |coverage|
-
-.. |release| image:: https://img.shields.io/pypi/v/fluidfoam.svg
-   :target: https://pypi.python.org/pypi/fluidfoam/
-   :alt: Latest version
-
-.. |docs| image:: https://readthedocs.org/projects/fluidfoam/badge/?version=latest
-   :target: http://fluidfoam.readthedocs.org
-   :alt: Documentation status
-
-.. |Github-action| image:: https://github.com/fluiddyn/fluidfoam/actions/workflows/build_and_test.yml/badge.svg
-   :target: https://github.com/fluiddyn/fluidfoam/actions
-   :alt: CI status
-
-.. |coverage| image:: https://codecov.io/gh/fluiddyn/fluidfoam/branch/master/graph/badge.svg
-   :target: https://codecov.io/gh/fluiddyn/fluidfoam/branch/master/
-   :alt: Code coverage
+[![release](https://img.shields.io/pypi/v/fluidfoam.svg)](https://pypi.python.org/pypi/fluidfoam/)
+[![docs](https://readthedocs.org/projects/fluidfoam/badge/?version=latest)](http://fluidfoam.readthedocs.org)
+[![Github-action](https://github.com/fluiddyn/fluidfoam/actions/workflows/build_and_test.yml/badge.svg)](https://github.com/fluiddyn/fluidfoam/actions)
+[![coverage](https://codecov.io/gh/fluiddyn/fluidfoam/branch/master/graph/badge.svg)](https://codecov.io/gh/fluiddyn/fluidfoam/branch/master/)
 
 The fluidfoam package provides Python classes useful to perform some plot with OpenFoam data.
 
 What is this repository for?
 ----------------------------
 
 * Openfoam Tools
-* Version : 0.2.8
-* Supported OpenFoam Versions : 2.4.0, 4.1 to 9, v1712plus to v2406plus
+* Version : 0.2.9
+* Supported OpenFoam Versions : 2.4.0, 4.1 to 9, v1712plus to latest
 * Supported Python Versions : >= 3.8
 
 Documentation and Examples
 --------------------------
 
-`http://fluidfoam.readthedocs.org
-<http://fluidfoam.readthedocs.org>`_
+[http://fluidfoam.readthedocs.org](http://fluidfoam.readthedocs.org>)
 
 Deployment instructions
 -----------------------
 
 The simplest way to install fluidfoam is by using pip::
 
-  pip install fluidfoam --user
+  `pip install fluidfoam --user`
 
-You can get the source code from `github
-<https://github.com/fluiddyn/fluidfoam>`_ or from `the Python Package Index
-<https://pypi.python.org/pypi/fluidfoam/>`_.
+You can get the source code from [github](https://github.com/fluiddyn/fluidfoam>)
+or from [the Python Package Index](https://pypi.python.org/pypi/fluidfoam/).
 
-The development mode is often useful. From the root directory, run::
+The development mode is often useful. From the fluidfoam directory, run::
 
-  python setup.py develop --user
+  `python3 -m pip install --editable . --user`
+  
+Or if you are using a virtual environment, run::
 
+  `python3 -m pip install --editable .`
 
 Committing instructions (in development mode)
 ---------------------------------------------
 
-A good starting point is to follow this `forking tutorial <https://guides.github.com/activities/forking/>`_.
+A good starting point is to follow this [forking tutorial](https://guides.github.com/activities/forking/).
 
 To clone your fork of fluidfoam repository::
 
-  git clone https://github.com/your_username/fluidfoam
+  `git clone https://github.com/your_username/fluidfoam`
 
 To get the status of the repository::
 
-  git status
+  `git status`
 
 In case of new/modified file(s)::
 
-  git add new_file
+  `git add new_file`
 
 To commit a revision on the local repository::
 
-  git commit -m "comment on the revision"
+  `git commit -m "comment on the revision"`
 
 To push the revision on your github fluidfoam repository::
 
-  git push
+  `git push`
 
-To propose your changes into the main fluidfoam project, follow again the `forking tutorial <https://guides.github.com/activities/forking/>`_.
+To propose your changes into the main fluidfoam project, follow again the [forking tutorial](https://guides.github.com/activities/forking/).
 
 Example Usage
 -------------