Skip to content

Commit abc8452

Browse files
committed
Merge branch 'master' of github.com:AHartmaier/pyLabFEA
2 parents c4678a8 + 01773b8 commit abc8452

File tree

6 files changed

+79
-20
lines changed

6 files changed

+79
-20
lines changed

.github/workflows/deploy.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: PyPi Release
1+
name: PyPI Release
22

33
on:
44
push:
@@ -8,25 +8,29 @@ on:
88

99
jobs:
1010
build:
11+
name: Build package
1112
runs-on: ubuntu-latest
12-
1313
steps:
1414
- uses: actions/checkout@v4
1515
- uses: actions/setup-python@v5
1616
with:
1717
python-version: "3.10"
1818

19-
- name: Install build backend
19+
- name: Install build backend and twine
2020
run: python -m pip install --upgrade build twine
21-
21+
2222
- name: Clean old builds
2323
run: rm -rf dist build *.egg-info
2424

2525
- name: Build sdist/wheel
2626
run: python -m build
27+
28+
- name: Check distribution metadata
29+
run: twine check dist/*
2730

2831
- name: Upload to PyPI
2932
env:
3033
TWINE_USERNAME: __token__
3134
TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
3235
run: twine upload dist/*
36+

.github/workflows/test_routine.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
run: |
2626
conda --version
2727
which python
28-
python -m pip install . --user
28+
python -m pip install .
2929
3030
- name: Run tests
3131
run: |

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ constitutive modeling of materials makes it a useful research tool for data-orie
2626

2727
## Installation
2828

29-
The preferred method to use Kanapy is within [Anaconda](https://www.anaconda.com) or [Miniconda](https://docs.conda.io/en/latest/miniconda.html), into which it can be easily installed from [conda-forge](https://conda-forge.org) by
29+
The preferred method to use pyLabFEA is within [Anaconda](https://www.anaconda.com) or [Miniconda](https://docs.conda.io/en/latest/miniconda.html), into which it can be easily installed from [conda-forge](https://conda-forge.org) by
3030

3131
```
3232
$ conda install pylabfea -c conda-forge
@@ -123,3 +123,5 @@ the GNU General Public License
123123
The contents of examples, notebooks and documentation are published under the
124124
Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License
125125
([CC BY-NC-SA 4.0 DEED](http://creativecommons.org/licenses/by-nc-sa/4.0/))
126+
127+
© 2025 by Authors, ICAMS/Ruhr University Bochum, Germany

THIRD_PARTY_LICENSES

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
This project makes use of the following third-party Python libraries:
2+
3+
Runtime / build dependencies
4+
----------------------------
5+
- NumPy
6+
License: BSD 3-Clause License
7+
URL: https://numpy.org
8+
License text: https://numpy.org/doc/stable/license.html
9+
10+
- SciPy
11+
License: BSD License
12+
URL: https://scipy.org
13+
License text: https://scipy.org/scipylib/license.html
14+
15+
- Matplotlib
16+
License: Matplotlib License (based on the Python Software Foundation license)
17+
URL: https://matplotlib.org
18+
License text: https://matplotlib.org/stable/users/project/license.html
19+
20+
- scikit-learn
21+
License: BSD 3-Clause License
22+
URL: https://scikit-learn.org
23+
License text: https://scikit-learn.org/stable/about.html#license
24+
25+
- ipympl ("Jupyter Matplotlib widget")
26+
License: BSD License
27+
URL: https://github.com/matplotlib/ipympl
28+
License text: https://github.com/matplotlib/ipympl/blob/main/LICENSE
29+
30+
Test / dev (not distributed with pyLabDD wheels)
31+
-----------------------------------------------
32+
- pytest
33+
License: MIT License
34+
Project: https://pytest.org
35+
License text: https://docs.pytest.org/en/stable/license.html
36+
37+
- black
38+
License: MIT License
39+
Project: https://github.com/psf/black
40+
41+
- build
42+
License: MIT License
43+
Project: https://pypi.org/project/build/
44+
45+
- twine
46+
License: Apache License 2.0
47+
Project: https://pypi.org/project/twine/
48+
49+
Notes
50+
-----
51+
These libraries are **not distributed with pyLabFEA**. They are installed
52+
separately via PyPI or conda(-forge) and include their own license information.
53+
This file is provided for the convenience of users.

pyproject.toml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools>=61", "wheel"]
2+
requires = ["setuptools>=77", "wheel"]
33
build-backend = "setuptools.build_meta"
44

55
[project]
@@ -12,31 +12,37 @@ authors = [
1212
{ name = "Jan Schmidt" }
1313
]
1414
readme = "README.md"
15-
requires-python = ">=3"
16-
license = "GPL-3.0-only"
15+
license = "GPL-3.0-or-later"
16+
license-files = [ "LICENSE" ]
17+
requires-python = ">=3.10"
1718
classifiers = [
1819
"Development Status :: 4 - Beta",
1920
"Intended Audience :: Science/Research",
2021
"Natural Language :: English",
2122
"Programming Language :: Python :: 3.10",
2223
"Programming Language :: Python :: 3.11",
2324
"Programming Language :: Python :: 3.12",
24-
"Programming Language :: Python :: 3.13"
25+
"Programming Language :: Python :: 3.13",
26+
"Topic :: Scientific/Engineering :: Physics",
2527
]
2628
dependencies = [
2729
"numpy",
2830
"matplotlib",
2931
"scipy",
3032
"scikit-learn",
31-
"pytest"
33+
"pytest",
34+
"ipympl"
3235
]
3336

3437
[project.optional-dependencies]
35-
test = ["pytest>=3"]
3638
dev = ["pytest-runner", "black", "build", "twine"]
3739

38-
[tool.setuptools]
39-
packages = ["pylabfea"]
40+
[tool.setuptools.packages.find]
41+
where = ["src"]
4042

4143
[tool.setuptools.package-dir]
4244
"" = "src"
45+
46+
[project.urls]
47+
Homepage = "https://github.com/AHartmaier/pyLabFEA"
48+

setup.py

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

0 commit comments

Comments
 (0)