Skip to content

Commit e289251

Browse files
update build deploy and pypi (#65)
* update make deplay pypi push
1 parent 65de672 commit e289251

File tree

18 files changed

+54
-539
lines changed

18 files changed

+54
-539
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
output_samples/** linguist-vendored
2-
appveyor/** linguist-vendored
32
doc/** linguist-documentation

.github/workflows/build_and_pypi.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ jobs:
77
# You can use PyPy versions in python-version.
88
# For example, pypy-2.7 and pypy-3.8
99
matrix:
10-
python-version: ["3.8", "3.9", "3.10"]
10+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
1111
outputs:
1212
version_changed: ${{ steps.check_file_changed.outputs.files_changed }}
1313
steps:
14-
- run: pip install -U pip pipenv coverage
14+
- run: pip install -U pip pipenv coverage build
1515
- run: pip install -U numpy scipy matplotlib
1616
- name: Check out repository code
1717
uses: actions/checkout@v4
1818
- run: set -o pipefail
1919
- name: Build and install fluidfoam
2020
run: |
21-
cd ${{ github.workspace }} && python setup.py develop --user
21+
cd ${{ github.workspace }} && python -m build && pip install dist/fluidfoam*.whl --user
2222
- name: Test fluidfoam
2323
run: make tests
2424
- name: Test fluidfoam coverage
@@ -28,7 +28,7 @@ jobs:
2828
with:
2929
token: ${{ secrets.codecov }}
3030
fail_ci_if_error: true
31-
files: ./.coverage/coverage.xml
31+
files: ./coverage.xml
3232
flags: unittests
3333
name: codecov-umbrella
3434
verbose: true
@@ -44,6 +44,7 @@ jobs:
4444
uses: casperdcl/deploy-pypi@v2
4545
with:
4646
password: ${{ secrets.PYPI_TOKEN }}
47-
pip: wheel -w dist/ --no-deps .
47+
build: --sdist --wheel --outdir dist .
48+
# old version : pip: wheel -w dist/ --no-deps .
4849
# only upload if a tag is pushed (otherwise just build & check)
4950
upload: ${{ github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') }}

.github/workflows/build_and_test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ jobs:
77
# You can use PyPy versions in python-version.
88
# For example, pypy-2.7 and pypy-3.8
99
matrix:
10-
python-version: ["3.8", "3.9", "3.10"]
10+
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
1111
outputs:
1212
version_changed: ${{ steps.check_file_changed.outputs.files_changed }}
1313
steps:
14-
- run: pip install -U pip pipenv coverage
14+
- run: pip install -U pip pipenv coverage build
1515
- run: pip install -U numpy scipy matplotlib
1616
- name: Check out repository code
1717
uses: actions/checkout@v4
1818
- run: set -o pipefail
1919
- name: Build and install fluidfoam
2020
run: |
21-
cd ${{ github.workspace }} && python setup.py develop --user
21+
cd ${{ github.workspace }} && python -m build && pip install dist/fluidfoam*.whl --user
2222
- name: Test fluidfoam
2323
run: make tests
2424
- name: Test fluidfoam coverage

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
syntax: glob
33
*pyc
44
*~
5-
.tox
65
dist
76
fluidfoam.egg-info
87
.coverage

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN /bin/bash -c "git clone https://github.com/fluiddyn/fluidfoam"
2323
WORKDIR /home/openfoam/fluidfoam
2424
RUN /bin/bash -c "make"
2525
RUN /bin/bash -c "make clean"
26-
RUN /bin/bash -c "python3 setup.py develop"
2726

2827
USER openfoam:openfoam
2928
# Set the default entry point & arguments

Dockerfile-ci

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ RUN /bin/bash -c "git clone https://github.com/fluiddyn/fluidfoam"
2323
WORKDIR /home/openfoam/fluidfoam
2424
RUN /bin/bash -c "make"
2525
RUN /bin/bash -c "make clean"
26-
RUN /bin/bash -c "python3 setup.py develop"
2726

2827
USER openfoam:openfoam
2928
# Set the default entry point & arguments
File renamed without changes.

Makefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11

2-
.PHONY: clean clean_all develop build_ext_inplace
2+
.PHONY: clean clean_all develop
33

44
develop:
5-
python setup.py develop
6-
7-
build_ext_inplace:
8-
python setup.py build_ext --inplace
5+
python -m build
6+
pip install dist/fluidfoam*.whl --user
97

108
clean:
11-
rm -rf build
9+
rm -rf dist
1210

1311
tests:
1412
python -m unittest discover
@@ -17,7 +15,6 @@ black:
1715
black -l 82 fluidfoam
1816

1917
tests_coverage:
20-
mkdir -p .coverage
2118
coverage run -p -m unittest discover
2219
coverage combine
2320
coverage report

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ What is this repository for?
2626
----------------------------
2727

2828
* Openfoam Tools
29-
* Version : 0.2.8
30-
* Supported OpenFoam Versions : 2.4.0, 4.1 to 9, v1712plus to v2406plus
29+
* Version : 0.2.9
30+
* Supported OpenFoam Versions : 2.4.0, 4.1 to 9, v1712plus to latest
3131
* Supported Python Versions : >= 3.8
3232

3333
Documentation and Examples

appveyor.yml

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)