Merge branch 'numpy2'

luweizheng · Sep 24, 2024 · b209a5b · b209a5b
2 parents e4fad51 + 997823f
commit b209a5b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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:

diff --git 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
@@ -1,6 +1,6 @@
 oldest-supported-numpy
 
-numpy<2.0.0
+numpy
 packaging
 wheel
 

diff --git 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'",

diff --git 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"