Skip to content

Commit

Permalink
Merge branch 'master' into prepare_SMT_2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul-Saves authored Nov 14, 2023
2 parents adb1565 + 67a66ea commit effe2c0
Show file tree
Hide file tree
Showing 27 changed files with 2,390 additions and 66 deletions.
59 changes: 59 additions & 0 deletions .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Build and upload to PyPI

on:
workflow_dispatch:
push:
tags: ['v*']

jobs:
build_wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, windows-2022, macos-11]

steps:
- uses: actions/checkout@v4

- name: Build wheels
uses: pypa/[email protected]
env:
CIBW_BUILD: cp38-* cp39-* cp310-* cp311-*
CIBW_SKIP: cp*_i686

- uses: actions/upload-artifact@v3
with:
path: ./wheelhouse/*.whl

build_sdist:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: Build sdist
run: pipx run build --sdist

- uses: actions/upload-artifact@v3
with:
path: dist/*.tar.gz

upload_pypi:
needs: [build_wheels, build_sdist]
runs-on: ubuntu-latest
environment: pypi
permissions:
id-token: write
steps:
- uses: actions/download-artifact@v3
with:
# unpacks default artifact into dist/
# if `name: artifact` is omitted, the action will create extra parent dir
name: artifact
path: dist

- uses: pypa/gh-action-pypi-publish@release/v1
with:
verbose: true

2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
python-version: "3.8"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up python
uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests_coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
python-version: ['3.8']

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*.pyd
*.pyc
*~
*build*
**/*build
*.egg-info
*.so
*.so.*
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ To cite SMT legacy: M. A. Bouhlel and J. T. Hwang and N. Bartoli and R. Lafage a
```

# Required packages
SMT depends on the following modules: numpy, scipy, scikit-learn, pyDOE2 and Cython.
SMT depends on the following modules: numpy, scipy, scikit-learn, pyDOE3 and Cython.

# Installation
If you want to install the latest release
Expand Down
1 change: 1 addition & 0 deletions doc/_src_docs/surrogate_models.rst

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions doc/_src_docs/surrogate_models.rstx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ SMT contains the surrogate modeling methods listed below.
surrogate_models/gekpls
surrogate_models/genn
surrogate_models/mgp
surrogate_models/sgp


Usage
Expand Down
Loading

0 comments on commit effe2c0

Please sign in to comment.