Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to copy #4789 for v23_release_branch #4841

Merged
merged 4 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
python-version: 3.8
- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.3.1
run: python -m pip install cibuildwheel
- name: Build wheels
run: python -m cibuildwheel --output-dir wheelhouse
env:
Expand Down
3 changes: 3 additions & 0 deletions pycbc/inference/sampler/emcee_pt.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
from pycbc.inference.io import EmceePTFile
from .. import models

# This is a hack that will allow us to continue using emcee's abandoned
# PTSampler, which relied on `numpy.float`, until the end of time.
numpy.float = float

if emcee.__version__ >= '3.0.0':
raise ImportError
Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
[build-system]
requires = ["setuptools",
"wheel",
"cython>=0.29.21",
"cython>=3.0.0",
"numpy==1.16.0; python_version <= '3.7'",
"numpy==1.17.3; python_version == '3.8'",
"numpy==1.19.3; python_version == '3.9'",
"numpy==1.21.4; python_version =='3.10'",
"numpy; python_version >= '3.11'",
"numpy==1.23.4; python_version >= '3.11'",
"numpy; python_version >= '3.12'"
]

# To ensure the best compatibility, try to match the numpy reqs
Expand Down
3 changes: 2 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# requirements for most basic library use
astropy>=2.0.3,!=4.2.1,!=4.0.5
Mako>=1.0.1
scipy>=0.16.0
# WORKAROUND FRO V23_RELEASE_BRANCH - LIMIT SCIPY VERSION
scipy>=0.16.0,<1.14.0
matplotlib>=2.0.0
# Remove the upper bound ASAP, this is a temporary fix!!!!!!
numpy>=1.16.0,!=1.19.0,<1.24.0
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
setup_requires = ['numpy>=1.16.0']
install_requires = setup_requires + [
'cython>=0.29',
'numpy>=1.16.0,!=1.19.0',
'scipy>=0.16.0',
'numpy>=1.16.0,!=1.19.0,<2.0.0',
'scipy>=0.16.0,<1.14.0',
'astropy>=2.0.3,!=4.2.1,!=4.0.5',
'matplotlib>=1.5.1',
'mpld3>=0.3',
Expand Down
Loading