Skip to content

Commit

Permalink
PyPI Version 0.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lpossner committed Jul 17, 2024
1 parent 7fc1586 commit b70fb19
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 88 deletions.
92 changes: 14 additions & 78 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
env:
TWINE_PASSWORD: ${{ secrets.twine_api_key }}
TWINE_USERNAME: __token__
macos_arm:
macos_arm64:
runs-on: macos-14
strategy:
matrix:
Expand All @@ -125,18 +125,11 @@ jobs:
pip install Cython matplotlib seaborn cibuildwheel twine
pip install -r requirements.txt
CC=gcc-13 CXX=g++-13 pip install .
# - name: Install dependencies
# run: |
# brew install gcc@13
# python -m pip install --upgrade pip
# pip install Cython matplotlib seaborn cibuildwheel twine
# pip install -r requirements.txt
# CC=gcc-13 CXX=g++-13 pip install .
# - name: Test with unittest
# run: |
# cd tests
# python -m unittest
# cd ..
- name: Test with unittest
run: |
cd tests
python -m unittest
cd ..
- name: Build with cibuildwheel
run: |
python -m cibuildwheel --output-dir wheelhouse
Expand All @@ -155,8 +148,8 @@ jobs:
env:
TWINE_PASSWORD: ${{ secrets.twine_api_key }}
TWINE_USERNAME: __token__
macos_arm64:
runs-on: macos-14
macos_x86_64:
runs-on: macos-13
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
Expand All @@ -182,81 +175,24 @@ jobs:
pip install Cython matplotlib seaborn cibuildwheel twine
pip install -r requirements.txt
CC=gcc-13 CXX=g++-13 pip install .
# - name: Install dependencies
# run: |
# brew install gcc@13
# python -m pip install --upgrade pip
# pip install Cython matplotlib seaborn cibuildwheel twine
# pip install -r requirements.txt
# CC=gcc-13 CXX=g++-13 pip install .
# - name: Test with unittest
# run: |
# cd tests
# python -m unittest
# cd ..
- name: Build with cibuildwheel
run: |
python -m cibuildwheel --output-dir wheelhouse
ls wheelhouse/
env:
MACOSX_DEPLOYMENT_TARGET: "10.14"
CIBW_BEFORE_BUILD: "pip install numpy delocate==0.10.7"
CIBW_BUILD: ${{ matrix.cibw-string }}
CIBW_REPAIR_WHEEL_COMMAND: "delocate-listdeps {wheel} && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
CC: gcc-13
CXX: g++-13
- name: Upload with twine
if: "contains(github.event.head_commit.message, 'PyPI')"
run: |
python -m twine upload wheelhouse/*.whl
env:
TWINE_PASSWORD: ${{ secrets.twine_api_key }}
TWINE_USERNAME: __token__
macos_x86_64:
runs-on: macos-13
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11", "3.12"]
include:
- python-version: "3.9"
cibw-string: "cp39-*"
- python-version: "3.10"
cibw-string: "cp310-*"
- python-version: "3.11"
cibw-string: "cp311-*"
- python-version: "3.12"
cibw-string: "cp312-*"
steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
brew install gcc@13
python -m pip install --upgrade pip
pip install Cython matplotlib seaborn cibuildwheel twine
pip install -r requirements.txt
CC=gcc-13 CXX=g++-13 pip install .
# - name: Install dependencies
# run: |
# brew install gcc@13
# python -m pip install --upgrade pip
# pip install Cython matplotlib seaborn cibuildwheel twine
# pip install -r requirements.txt
# CC=gcc-13 CXX=g++-13 pip install .
# - name: Test with unittest
# run: |
# cd tests
# python -m unittest
# cd ..
- name: Test with unittest
run: |
cd tests
python -m unittest
cd ..
- name: Build with cibuildwheel
run: |
python -m cibuildwheel --output-dir wheelhouse
ls wheelhouse/
env:
MACOSX_DEPLOYMENT_TARGET: "10.14"
MACOSX_DEPLOYMENT_TARGET: "10.13"
CIBW_BEFORE_BUILD: "pip install numpy delocate==0.10.7"
CIBW_BUILD: ${{ matrix.cibw-string }}
CIBW_REPAIR_WHEEL_COMMAND: "delocate-listdeps {wheel} && delocate-wheel --require-archs {delocate_archs} -w {dest_dir} -v {wheel}"
Expand Down
11 changes: 1 addition & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@
np.get_include(),
]

# if sys.platform == 'darwin':
# extensions = []
# else:
# extensions = [Extension('pygpc.pygpc_extensions',
# sources=pygpc_extensions_src_file_path,
# include_dirs=pygpc_extensions_include_path,
# extra_compile_args=openmp_compile_args,
# extra_link_args=openmp_link_args)]

extensions = [
Extension(
"pygpc.pygpc_extensions",
Expand All @@ -56,7 +47,7 @@

setup(
name="pygpc",
version="0.3.9",
version="0.4.0",
description="A sensitivity and uncertainty analysis toolbox for Python",
author="Konstantin Weise",
author_email="[email protected]",
Expand Down

0 comments on commit b70fb19

Please sign in to comment.