Skip to content

Commit

Permalink
Trying to fix wheels build (#152)
Browse files Browse the repository at this point in the history
* trying to fix wheels build

* updadting eigen
  • Loading branch information
dfm committed Mar 12, 2021
1 parent 14bfdc8 commit 969e86f
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 40 deletions.
50 changes: 15 additions & 35 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
@@ -1,70 +1,51 @@
name: Wheels
on:
push:
branches: [main]
pull_request:
branches: [main]
release:
types:
- published
types: [published]

jobs:
build_wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04, windows-latest, macos-latest]
os: [ubuntu-20.04, windows-2019, macos-10.15]
steps:
- uses: actions/checkout@v2
with:
submodules: true
fetch-depth: 0

- uses: actions/setup-python@v2
name: Install Python
with:
python-version: "3.7"

- uses: ilammy/msvc-dev-cmd@v1

- name: Install cibuildwheel
run: |
python -m pip install cibuildwheel==1.5.1
- name: Build wheels on Windows
if: runner.os == 'Windows'
run: python -m cibuildwheel --output-dir wheelhouse
env:
CIBW_BUILD: "cp3?-win_amd64"
DISTUTILS_USE_SDK: 1
MSSdk: 1

- name: Build wheels on Mac and Linux
if: runner.os != 'Windows'
run: |
python -m cibuildwheel --output-dir wheelhouse
- uses: joerick/cibuildwheel@v1.9.0
env:
CIBW_BUILD: "cp3?-*"
CIBW_SKIP: "*-manylinux_i686"
CIBW_SKIP: "cp35-* *-win32 *-manylinux_i686"
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014

DISTUTILS_USE_SDK: 1
MSSdk: 1
- uses: actions/upload-artifact@v2
with:
path: ./wheelhouse/*.whl

build_sdist:
name: Build source distribution
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
fetch-depth: 0

- uses: actions/setup-python@v2
name: Install Python
with:
python-version: "3.7"

python-version: "3.9"
- name: Build sdist
run: python setup.py sdist

run: |
python -m pip install -U pip
python -m pip install -U build
python -m build --sdist .
- uses: actions/upload-artifact@v2
with:
path: dist/*.tar.gz
Expand All @@ -83,4 +64,3 @@ jobs:
with:
user: __token__
password: ${{ secrets.pypi_password }}
# To test: repository_url: https://test.pypi.org/legacy/
6 changes: 2 additions & 4 deletions src/exoplanet/theano_ops/interp/regular_grid.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import pkg_resources
from aesara_theano_fallback import aesara as theano

from ...exoplanet_version import __version__
from ..build_utils import get_cache_version
from ..compat import Apply, COp, ParamsType


Expand Down Expand Up @@ -38,9 +38,7 @@ def perform(self, *args, **kwargs):
raise NotImplementedError("Only the C version is implemented")

def c_code_cache_version(self, *args, **kwargs):
if "dev" in __version__:
return ()
return tuple(map(int, __version__.split(".")))
return get_cache_version()

def c_headers(self, *args, **kwargs):
return ["theano_helpers.h"]
Expand Down
2 changes: 1 addition & 1 deletion src/exoplanet/theano_ops/lib/vendor/eigen
Submodule eigen updated from 23b7f0 to 0fd6b4

0 comments on commit 969e86f

Please sign in to comment.