Skip to content

Commit

Permalink
Attempt to fix NumPy ABI incompatibility (#240)
Browse files Browse the repository at this point in the history
* Update _version.py

* Update CHANGELOG.md

* Update appveyor.yml

* Update config.yml
  • Loading branch information
josh146 authored Apr 24, 2021
1 parent 1838438 commit 7659ec6
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
- image: circleci/python:3.6.12-stretch
environment:
CIBW_SKIP: "pp* cp27-* cp34-* cp35-* cp36-* *i686"
CIBW_BEFORE_BUILD_LINUX: curl -OsL https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.gz && tar xzf eigen-3.3.7.tar.gz eigen-3.3.7/Eigen --strip-components 1 && cp -rf Eigen {project}/include && pip install numpy~=1.19 scipy cython
CIBW_BEFORE_BUILD_LINUX: curl -OsL https://gitlab.com/libeigen/eigen/-/archive/3.3.7/eigen-3.3.7.tar.gz && tar xzf eigen-3.3.7.tar.gz eigen-3.3.7/Eigen --strip-components 1 && cp -rf Eigen {project}/include && pip install numpy==1.19.5 scipy cython
CIBW_TEST_REQUIRES: numpy scipy pytest pytest-cov pytest-randomly
CIBW_TEST_COMMAND: python -m pytest --randomly-seed=137 {project}/thewalrus
steps:
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
CIBW_SKIP: "pp* cp27-* cp34-* cp35-* cp36-* *i686"
CIBW_ENVIRONMENT: "MACOSX_DEPLOYMENT_TARGET=10.9"

CIBW_BEFORE_BUILD_MACOS: brew install gmp gcc eigen libomp; pip install numpy~=1.19 scipy cython
CIBW_BEFORE_BUILD_MACOS: brew install gmp gcc eigen libomp; pip install numpy==1.19.5 scipy cython
CIBW_TEST_REQUIRES: numpy scipy pytest pytest-cov pytest-randomly
CIBW_TEST_COMMAND: python -m pytest --randomly-seed=137 {project}/thewalrus
steps:
Expand Down
12 changes: 6 additions & 6 deletions .github/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# Version 0.16.0-dev

### New features

### Improvements
# Version 0.15.1

### Bug fixes

### Breaking changes
* Builds The Walrus binaries against an older version of NumPy, to avoid
a breaking ABI change in NumPy 1.20.
[#240](https://github.com/XanaduAI/thewalrus/pull/240)

### Contributors

This release contains contributions from (in alphabetical order):

Josh Izaac

---

# Version 0.15.0
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ environment:
APPVEYOR_SKIP_FINALIZE_ON_EXIT: true
EIGEN_INCLUDE_DIR: C:\eigen-3.3.7\
TEST_TIMEOUT: 1000
CIBW_BEFORE_BUILD: pip install numpy~=1.19 scipy cython
CIBW_BEFORE_BUILD: pip install numpy==1.19.5 scipy cython
CIBW_SKIP: "cp27-* cp33-* cp34-* cp35-* cp36-* *win32"
CIBW_TEST_REQUIRES: "numpy scipy pytest pytest-cov pytest-randomly"
CIBW_TEST_COMMAND: "python -m pytest --randomly-seed=137 {project}/thewalrus"
Expand Down
2 changes: 1 addition & 1 deletion thewalrus/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
Version number (major.minor.patch[-label])
"""

__version__ = "0.15.0"
__version__ = "0.15.1"

0 comments on commit 7659ec6

Please sign in to comment.