Skip to content

Commit

Permalink
BLD: Compat with numpy 2.x (#826)
Browse files Browse the repository at this point in the history
  • Loading branch information
luweizheng authored Nov 5, 2024
1 parent accc0d4 commit 5bb0211
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/asv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
fetch-depth: 0

- name: Set up conda python3.11
- name: Set up conda python
uses: conda-incubator/setup-miniconda@v3.0.4
with:
python-version: 3.11
Expand All @@ -38,7 +38,7 @@ jobs:
shell: bash -el {0}
run: |
conda install anaconda::libmambapy
pip install "numpy<2.0" scipy cython coverage asv
pip install numpy scipy cython coverage asv
cd python && pip install -e ".[dev,extra]"
- name: Run ASV benchmarks
Expand Down
2 changes: 1 addition & 1 deletion asv/asv.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
// will not be set for the current combination.
//
"matrix": {
"numpy": ["1.26.4"],
"numpy": [],
"Cython": [],
"pandas": [],
"scipy": [],
Expand Down
13 changes: 7 additions & 6 deletions doc/source/getting_started/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Xorbits can be installed via pip from `PyPI <https://pypi.org/project/xorbits>`_
Python version support
----------------------

Officially Python 3.9, 3.10 and 3.11.
Officially Python 3.9, 3.10, 3.11, and 3.12.

Packages support
----------------
Expand All @@ -27,11 +27,12 @@ to be compatible with the latest single-node packages. The table below lists the
versions of the single-node packages that Xorbits are compatible with. If you are using
an older version of pandas, you should either upgrade your pandas or downgrade Xorbits.

======= ======== ========= ========== =========== ===========
Xorbits `NumPy`_ `pandas`_ `xgboost`_ `lightgbm`_ `datasets`_
======= ======== ========= ========== =========== ===========
0.7.4 1.26.4 2.2.3 2.1.1 4.5.0 3.0.1
======= ======== ========= ========== =========== ===========
======= =================== ======== ========= ========== =========== ===========
Xorbits Python `NumPy`_ `pandas`_ `xgboost`_ `lightgbm`_ `datasets`_
======= =================== ======== ========= ========== =========== ===========
0.8.0 3.9,3.10,3.11,3.12 2.1.3 2.2.3 2.1.2 4.5.0 3.1.0
0.7.4 3.9,3.10,3.11 1.26.4 2.2.3 2.1.1 4.5.0 3.0.1
======= =================== ======== ========= ========== =========== ===========

.. _`NumPy`: https://numpy.org
.. _`pandas`: https://pandas.pydata.org
Expand Down
2 changes: 1 addition & 1 deletion python/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ requires = [
"packaging",
"wheel",
"oldest-supported-numpy",
"numpy<2.0.0",
"numpy",
"pandas==1.2.2; python_version>='3.9' and python_version<'3.10' and platform_machine!='arm64'",
"pandas==1.4.0; python_version>='3.9' and python_version<'3.10' and platform_machine=='arm64'",
"pandas==1.3.4; python_version>='3.10' and python_version<'3.11' and platform_machine!='arm64'",
Expand Down
2 changes: 1 addition & 1 deletion python/xorbits/deploy/docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN /opt/conda/bin/conda install -c conda-forge --solver classic \
libnuma \
&& pip install -U pip \
&& pip install -U \
"numpy>=1.14.0,<2.0" \
numpy \
scipy\>=1.9.2 \
pandas\>=1.5.0 \
xoscar \
Expand Down

0 comments on commit 5bb0211

Please sign in to comment.