Skip to content

Commit

Permalink
Fix numpy api compatibility issue (#175)
Browse files Browse the repository at this point in the history
* Fix compatibility issue with NumPy API

There is a potential API compatibility issue with the NumPy. When building binary wheels, the latest NumPy is used. However, the user may already have installed on older version of NumPy on his system. If the API has changed between those two version, you will get an incompatibility error. See for example pypa/pip#9542 for more details. The solution suggested there, use `oldest-supported-numpy` instead of `numpy`, has been adopted.

* Bump version number to 1.10.1
  • Loading branch information
gmloose authored Feb 14, 2022
1 parent 9bd311e commit acf8c48
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 8 deletions.
4 changes: 3 additions & 1 deletion bdsf/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
"""

# Version number
__version__ = '1.10.0'
__version__ = '1.10.1'


# Changelog
def changelog():
"""
PyBDSF Changelog.
-----------------------------------------------------------------------
2022/02/14 - Version 1.10.1: Fix Numpy API incompatibility issue
2022/02/09 - Version 1.10.0
2022/02/09 - Update some functions as required by scipy versions >= 1.8.0
Expand Down
2 changes: 1 addition & 1 deletion doc/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
# The short X.Y version.
version = '1.10'
# The full version, including alpha/beta/rc tags.
release = '1.10.0'
release = '1.10.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
3 changes: 3 additions & 0 deletions doc/source/whats_new.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
What's New
**********

Version 1.10.1 (2022/02/14):
* Fix NumPy API compatibility issue

Version 1.10.0 (2022/02/09):
* Update some functions as required by scipy version >= 1.8.0 (PR #172)

Expand Down
2 changes: 1 addition & 1 deletion manylinux2010/wheel36.docker
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ENV PYUNICODE m
ENV TARGET cp${PYMAJOR}${PYMINOR}-cp${PYMAJOR}${PYMINOR}${PYUNICODE}

# install python dependencies, make boost install also boost_numpy
RUN /opt/python/${TARGET}/bin/pip install numpy
RUN /opt/python/${TARGET}/bin/pip install oldest-supported-numpy

# setup boost
WORKDIR /build
Expand Down
2 changes: 1 addition & 1 deletion manylinux2010/wheel37.docker
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ENV PYUNICODE m
ENV TARGET cp${PYMAJOR}${PYMINOR}-cp${PYMAJOR}${PYMINOR}${PYUNICODE}

# install python dependencies, make boost install also boost_numpy
RUN /opt/python/${TARGET}/bin/pip install numpy
RUN /opt/python/${TARGET}/bin/pip install oldest-supported-numpy

# setup boost
WORKDIR /build
Expand Down
2 changes: 1 addition & 1 deletion manylinux2010/wheel38.docker
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ENV PYMINOR 8
ENV TARGET cp${PYMAJOR}${PYMINOR}-cp${PYMAJOR}${PYMINOR}

# install python dependencies, make boost install also boost_numpy
RUN /opt/python/${TARGET}/bin/pip install numpy
RUN /opt/python/${TARGET}/bin/pip install oldest-supported-numpy

# setup boost
WORKDIR /build
Expand Down
2 changes: 1 addition & 1 deletion manylinux2010/wheel39.docker
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ ENV PYMINOR 9
ENV TARGET cp${PYMAJOR}${PYMINOR}-cp${PYMAJOR}${PYMINOR}

# install python dependencies, make boost install also boost_numpy
RUN /opt/python/${TARGET}/bin/pip install numpy
RUN /opt/python/${TARGET}/bin/pip install oldest-supported-numpy

# setup boost
WORKDIR /build
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[build-system]
requires = ["setuptools",
"wheel",
"numpy"]
"oldest-supported-numpy"]
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def main():

setup(
name='bdsf',
version='1.10.0',
version='1.10.1',
author='David Rafferty',
author_email='[email protected]',
url='https://github.com/lofar-astron/PyBDSF',
Expand Down

0 comments on commit acf8c48

Please sign in to comment.