From 57a4f84db74cf8d4f4201f0aade490b907683dad Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Fri, 14 Jun 2024 22:20:31 +0800 Subject: [PATCH 1/4] fix pypi & dockerhub --- python/xorbits/deploy/docker/Dockerfile.base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/xorbits/deploy/docker/Dockerfile.base b/python/xorbits/deploy/docker/Dockerfile.base index 85991b084..a2fcf0368 100644 --- a/python/xorbits/deploy/docker/Dockerfile.base +++ b/python/xorbits/deploy/docker/Dockerfile.base @@ -1,4 +1,4 @@ -ARG BASE_CONTAINER=continuumio/miniconda3:4.12.0 +ARG BASE_CONTAINER=continuumio/miniconda3:23.10.0-1 ARG PYTHON_VERSION=3.9 FROM ${BASE_CONTAINER} AS base From 680bb8889795a1d3ebb45c7ce9e7a9d7b06d5324 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Fri, 14 Jun 2024 22:22:31 +0800 Subject: [PATCH 2/4] fix pypi & dockerhub --- .github/workflows/build-wheel.yaml | 8 ++++---- .github/workflows/docker-cd.yaml | 2 +- CI/requirements-wheel.txt | 8 ++------ 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-wheel.yaml b/.github/workflows/build-wheel.yaml index 73f9aebdb..982e0d0d9 100644 --- a/.github/workflows/build-wheel.yaml +++ b/.github/workflows/build-wheel.yaml @@ -21,11 +21,8 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] arch: [auto] - requires-python: [">=3.8,<3.10", ">=3.10,<3.12"] + requires-python: [">=3.9,<=3.12"] include: - - os: ubuntu-latest - arch: aarch64 - requires-python: ">=3.8,<3.9" - os: ubuntu-latest arch: aarch64 requires-python: ">=3.9,<3.10" @@ -35,6 +32,9 @@ jobs: - os: ubuntu-latest arch: aarch64 requires-python: ">=3.11,<3.12" + - os: ubuntu-latest + arch: aarch64 + requires-python: ">=3.12" - os: macos-latest arch: universal2 requires-python: ">=3.8,<3.10" diff --git a/.github/workflows/docker-cd.yaml b/.github/workflows/docker-cd.yaml index 9241645b5..068e5952e 100644 --- a/.github/workflows/docker-cd.yaml +++ b/.github/workflows/docker-cd.yaml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ "3.8", "3.9", "3.10", "3.11" ] + python-version: [ "3.9", "3.10", "3.11", "3.12" ] steps: - name: Check out code uses: actions/checkout@v3 diff --git a/CI/requirements-wheel.txt b/CI/requirements-wheel.txt index 4472032c3..49a873db2 100644 --- a/CI/requirements-wheel.txt +++ b/CI/requirements-wheel.txt @@ -1,16 +1,12 @@ oldest-supported-numpy -pandas==1.0.4; python_version<'3.9' and platform_machine!='aarch64' -pandas==1.1.3; python_version<'3.9' and platform_machine=='aarch64' pandas==1.2.2; python_version>='3.9' and python_version<'3.10' pandas==1.3.4; python_version>='3.10' and python_version<'3.11' -pandas==1.5.0; python_version>='3.11' +pandas==2.2.2; python_version>='3.11' -scipy==1.4.1; python_version<'3.9' and platform_machine!='aarch64' -scipy==1.5.3; python_version<'3.9' and platform_machine=='aarch64' scipy==1.5.4; python_version>='3.9' and python_version<'3.10' scipy==1.7.2; python_version>='3.10' and python_version<'3.11' -scipy==1.10.0; python_version>='3.11' +scipy==1.13.1; python_version>='3.11' # see: https://github.com/cython/cython/commit/afc00fc3ba5d43c67151c0039847a526e7b627a5 cython==0.29.33 From 5ffe331375a512159b06356152264c4605277e7d Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Sat, 15 Jun 2024 17:14:46 +0800 Subject: [PATCH 3/4] fix pypi & dockerhub --- .github/workflows/build-wheel.yaml | 18 +++--------------- CI/requirements-wheel.txt | 4 ++-- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build-wheel.yaml b/.github/workflows/build-wheel.yaml index 982e0d0d9..3e52d6c10 100644 --- a/.github/workflows/build-wheel.yaml +++ b/.github/workflows/build-wheel.yaml @@ -21,26 +21,14 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-latest] arch: [auto] - requires-python: [">=3.9,<=3.12"] + requires-python: [">=3.9,<3.12"] include: - os: ubuntu-latest arch: aarch64 - requires-python: ">=3.9,<3.10" - - os: ubuntu-latest - arch: aarch64 - requires-python: ">=3.10,<3.11" - - os: ubuntu-latest - arch: aarch64 - requires-python: ">=3.11,<3.12" - - os: ubuntu-latest - arch: aarch64 - requires-python: ">=3.12" - - os: macos-latest - arch: universal2 - requires-python: ">=3.8,<3.10" + requires-python: ">=3.9,<3.12" - os: macos-latest arch: universal2 - requires-python: ">=3.10,<3.12" + requires-python: ">=3.9,<3.12" steps: - uses: actions/checkout@v3 diff --git a/CI/requirements-wheel.txt b/CI/requirements-wheel.txt index 49a873db2..fc5c44efe 100644 --- a/CI/requirements-wheel.txt +++ b/CI/requirements-wheel.txt @@ -2,11 +2,11 @@ oldest-supported-numpy pandas==1.2.2; python_version>='3.9' and python_version<'3.10' pandas==1.3.4; python_version>='3.10' and python_version<'3.11' -pandas==2.2.2; python_version>='3.11' +pandas==1.5.1; python_version>='3.11' and python_version<'3.12' scipy==1.5.4; python_version>='3.9' and python_version<'3.10' scipy==1.7.2; python_version>='3.10' and python_version<'3.11' -scipy==1.13.1; python_version>='3.11' +scipy==1.10.0; python_version>='3.11' and python_version<'3.12' # see: https://github.com/cython/cython/commit/afc00fc3ba5d43c67151c0039847a526e7b627a5 cython==0.29.33 From fefe076342975c1604b5a6df5d6ca56012860255 Mon Sep 17 00:00:00 2001 From: Lu Weizheng Date: Sat, 15 Jun 2024 17:16:26 +0800 Subject: [PATCH 4/4] fix pypi & dockerhub --- .github/workflows/docker-cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-cd.yaml b/.github/workflows/docker-cd.yaml index 068e5952e..a696d820b 100644 --- a/.github/workflows/docker-cd.yaml +++ b/.github/workflows/docker-cd.yaml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [ "3.9", "3.10", "3.11", "3.12" ] + python-version: [ "3.9", "3.10", "3.11" ] steps: - name: Check out code uses: actions/checkout@v3