From 399d353a7de4e8abd1afcac46485a881b5509a62 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Thu, 8 Aug 2024 23:39:00 +0800 Subject: [PATCH 1/3] support numpy 2.0 --- CI/conda-environment.yml | 2 +- CI/requirements-wheel.txt | 2 +- python/pyproject.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CI/conda-environment.yml b/CI/conda-environment.yml index 335c4b0a..f4b60116 100644 --- a/CI/conda-environment.yml +++ b/CI/conda-environment.yml @@ -2,7 +2,7 @@ name: xoscar-test channels: - defaults dependencies: - - numpy<2.0.0 + - numpy - cloudpickle - coverage - cython diff --git a/CI/requirements-wheel.txt b/CI/requirements-wheel.txt index 1e7e7967..7641aa6c 100644 --- a/CI/requirements-wheel.txt +++ b/CI/requirements-wheel.txt @@ -1,6 +1,6 @@ oldest-supported-numpy -numpy<2.0.0 +numpy packaging wheel diff --git a/python/pyproject.toml b/python/pyproject.toml index 17ac3eec..68d9e2a0 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -21,7 +21,7 @@ requires = [ "pandas==1.4.0; python_version>='3.10' and python_version<'3.11' and platform_machine=='arm64'", "pandas==1.5.1; python_version>='3.11' and python_version<'3.12'", "pandas>=2.1.1; python_version>'3.11'", - "numpy<2.0.0", + "numpy", "cython>=0.29.33", "requests>=2.4.0", "cloudpickle>=2.2.1; python_version>='3.11'", From 460e079bc5e6a0fb29fb0422c93fac253fc4e559 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Fri, 9 Aug 2024 00:03:43 +0800 Subject: [PATCH 2/3] support numpy 2.0 --- python/setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/setup.cfg b/python/setup.cfg index d2cbed03..0437cef6 100644 --- a/python/setup.cfg +++ b/python/setup.cfg @@ -24,7 +24,7 @@ zip_safe = False include_package_data = True packages = find: install_requires = - numpy>=1.14.0,<2.0.0 + numpy>=1.14.0 pandas>=1.0.0 scipy>=1.0.0; sys_platform!="win32" or python_version>="3.10" scipy>=1.0.0,<=1.9.1; sys_platform=="win32" and python_version<"3.10" From 997823f3770462ea0a965c9af3c4c2f4f77e193e Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Wed, 4 Sep 2024 15:05:05 +0800 Subject: [PATCH 3/3] runner --- .github/workflows/python.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml index 77bb4bae..ca1ab242 100644 --- a/.github/workflows/python.yaml +++ b/.github/workflows/python.yaml @@ -65,7 +65,7 @@ jobs: find . -name "CMakeLists.txt" -not -path "*third_party/*" | xargs cmake-format -c .cmake-format.yaml --check build_test_job: - if: github.repository == 'xorbitsai/xoscar' + # if: github.repository == 'xorbitsai/xoscar' runs-on: ${{ matrix.os }} needs: lint env: