Skip to content

Commit 774b25b

Browse files
authored
Merge pull request #1157 from ToFuProject/devel
Prepare 1.8.18
2 parents f0d622d + d2034b4 commit 774b25b

File tree

164 files changed

+10621
-6541
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+10621
-6541
lines changed

.coveragerc

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

.github/workflows/test-complete-matrix.yml

Lines changed: 56 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ name: Complete testing matrix
22

33
on:
44
push:
5-
branches: [ devel, master ]
5+
branches:
6+
- devel
7+
- master
68
pull_request:
7-
branches: [ devel, master ]
9+
branches:
10+
- devel
11+
- master
812

913
jobs:
1014
build:
@@ -13,37 +17,64 @@ jobs:
1317

1418
strategy:
1519
matrix:
16-
os: [ubuntu-latest, macOS-latest] # , windows-latest
17-
python-version: ['3.8', '3.9', '3.10', '3.11']
20+
os: [ubuntu-latest]
21+
# macOS-latest: issue with latex + meson fails build
22+
# windows-latest: issue with TcL install error + meson fails to build
23+
python-version: ['3.9', '3.10', '3.11']
1824
exclude:
1925
- python-version: ['3.11']
2026
os: windows-latest
2127

2228
steps:
23-
- uses: actions/checkout@v4
24-
- name: Set up Python ${{ matrix.python-version }}
25-
uses: actions/setup-python@v5
29+
30+
# Install latex
31+
- name: Install latex for matplotlib
32+
shell: bash
33+
run: |
34+
if [ "$RUNNER_OS" == "Linux" ]; then
35+
sudo apt update
36+
sudo apt install texlive texlive-latex-extra texlive-fonts-recommended dvipng cm-super
37+
elif [ "$RUNNER_OS" == "macOS" ]; then
38+
# not enough to fix latex issue
39+
sudo brew install --cask mactex
40+
elif [ "$RUNNER_OS" != "Linux" ]; then
41+
echo "$RUNNER_OS not supported"
42+
exit 0
43+
fi
44+
45+
# git checkout
46+
- name: git checkout
47+
uses: actions/checkout@v5
2648
with:
27-
python-version: ${{ matrix.python-version }}
28-
- name: Install dependencies
49+
# https://github.com/marketplace/actions/checkout#usage
50+
fetch-depth: 0 # to fetch all history from all branches
51+
fetch-tags: true
52+
53+
# Install uv
54+
- name: Install uv
55+
uses: astral-sh/setup-uv@v5
56+
with:
57+
python-version: ${{ matrix.python-version }}
58+
59+
# Build dist
60+
- name: Build the project
2961
run: |
30-
curl -X PURGE https://pypi.org/simple/datastock/
31-
curl -X PURGE https://pypi.org/simple/bsplines2d/
32-
curl -X PURGE https://pypi.org/simple/spectrally/
33-
pip install --upgrade pip
34-
pip install flake8 pytest coverage wheel
35-
pip install -r requirements.txt --no-cache
36-
- name: Lint with flake8
62+
uv build
63+
64+
# Create and activate env
65+
- name: Create and activate env
3766
run: |
38-
# stop the build if there are Python syntax errors or undefined names
39-
# flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
40-
flake8 . --count --select=E9,F63,F7 --show-source --statistics
41-
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
42-
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
43-
- name: install tofu
67+
uv venv venv --python ${{ matrix.python-version }}
68+
source .venv/bin/activate
69+
uv pip install latex
70+
71+
# Install library
72+
- name: Install the project
4473
run: |
45-
python -c "import setuptools; print(f'\nsetuptools version = {setuptools.__version__}\n')"
46-
pip install -e ".[dev]" --no-build-isolation
74+
uv pip install ./dist/*.whl
75+
76+
# Run tests
4777
- name: Test with pytest and coverage
4878
run: |
49-
coverage run --source=tofu/ -m pytest tofu/tests -v -x --durations=10
79+
cd ./dist/
80+
pytest --pyargs tofu.tests -xv --durations=10
Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Ubuntu, py 3.8, pip
1+
name: Ubuntu, py 3.11, pip
22

33
on:
44
push:
@@ -11,32 +11,53 @@ on:
1111
- master
1212
- devel
1313
- deploy-test
14+
1415
jobs:
1516
build-linux:
1617
runs-on: ubuntu-latest
1718
strategy:
1819
max-parallel: 5
1920
steps:
20-
- uses: actions/checkout@v4
21-
- name: Set up Python 3.9
22-
uses: actions/setup-python@v5
21+
22+
# Install latex
23+
- name: Install latex for matplotlib
24+
run: |
25+
sudo apt update
26+
sudo apt install texlive texlive-latex-extra texlive-fonts-recommended dvipng cm-super
27+
28+
# git checkout
29+
- name: git checkout
30+
uses: actions/checkout@v5
2331
with:
24-
python-version: 3.9
25-
- name: Install dependencies
32+
# https://github.com/marketplace/actions/checkout#usage
33+
fetch-depth: 0 # to fetch all history from all branches
34+
fetch-tags: true
35+
36+
# Install uv
37+
- name: Install uv
38+
uses: astral-sh/setup-uv@v5
39+
with:
40+
python-version: 3.11
41+
42+
# Build dist
43+
- name: Build the project
2644
run: |
27-
pip install --upgrade pip
28-
pip install flake8 pytest coverage wheel
29-
pip install -r requirements.txt # fix
30-
- name: Lint with flake8
45+
uv build
46+
47+
# Create and activate env
48+
- name: Create and activate env
3149
run: |
32-
# stop the build if there are Python syntax errors or undefined names
33-
# too many F82 errors, should uncomment the following line
34-
flake8 . --count --select=E9,F63,F7 --show-source --statistics
35-
# exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
36-
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
37-
- name: install tofu
50+
uv venv venv --python 3.11
51+
source .venv/bin/activate
52+
uv pip install latex
53+
54+
# Install library
55+
- name: Install the project
3856
run: |
39-
pip install -e ".[dev]" --no-build-isolation
57+
uv pip install ./dist/*.whl
58+
59+
# Run tests
4060
- name: Test with pytest and coverage
4161
run: |
42-
coverage run --source=tofu/ -m pytest tofu/tests -x -v --durations=10
62+
cd ./dist/
63+
pytest --pyargs tofu.tests -xv --durations=10

.travis.yml

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

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 Didier Vezinet
3+
Copyright (c) 2023 ToFuProject
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)