From 7af0abfb8f09be6ec3247865f0f6344b28d2bb1d Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 09:11:13 -0800 Subject: [PATCH 01/27] First attempt --- .github/workflows/pythonwheels.yml | 124 +++++++++++++++++++++++++++++ manylinux_build.sh | 23 ++++++ 2 files changed, 147 insertions(+) create mode 100644 .github/workflows/pythonwheels.yml create mode 100644 manylinux_build.sh diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml new file mode 100644 index 0000000..150326e --- /dev/null +++ b/.github/workflows/pythonwheels.yml @@ -0,0 +1,124 @@ +name: Create Platform Wheels + +on: [push] + +jobs: + manylinux-x86_64-wheel: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.6, 3.7, 3.8] + steps: + - uses: actions/checkout@master + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Docker Build + run: | + docker run --rm -e PLAT=maylinux1_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/manylinux_build.sh + - name: Install and test wheel + run: | + mkdir temp + cd temp + python -m pip install --upgrade pip + python -m pip install pandas --no-index -f ../wheelhouse + python -c "import pandas; pandas.test()" + cd .. + - name: Upload linux wheel artifact + uses: actions/upload-artifact@v1 + with: + name: ${{ matrix.python-version }}-manylinux + path: wheelhouse + + manylinux-i686-wheel: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: [3.6, 3.7, 3.8] + steps: + - uses: actions/checkout@master + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Docker Build + run: | + docker run --rm -e PLAT=maylinux1_i686 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/manylinux_build.sh + - name: Install and test wheel + run: | + mkdir temp + cd temp + python -m pip install --upgrade pip + python -m pip install pandas --no-index -f ../wheelhouse + python -c "import pandas; pandas.test()" + cd .. + - name: Upload linux wheel artifact + uses: actions/upload-artifact@v1 + with: + name: ${{ matrix.python-version }}-manylinux + path: wheelhouse + + macos-wheel: + runs-on: macos-latest + strategy: + matrix: + python-version: [3.6, 3.7, 3.8] + steps: + - uses: actions/checkout@master + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install setuptools wheel + - name: Build wheels + run: | + python setup.py bdist_wheel + - name: Install and test wheel + run: | + mkdir temp + cd temp + python -m pip install pytest + python -m pip install pandas --no-index -f ../dist + python -c "import pandas; pandas.test()" + cd .. + - name: Upload linux wheel artifact + uses: actions/upload-artifact@v1 + with: + name: ${{ matrix.python-version }}-macos + path: dist + + windows-wheel: + runs-on: windows-latest + strategy: + matrix: + python-version: [3.6, 3.7, 3.8] + steps: + - uses: actions/checkout@master + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + python -m pip install setuptools wheel + - name: Build wheels + run: | + python setup.py bdist_wheel + - name: Install and test wheel + run: | + mkdir temp + cd temp + python -m pip install pytest + python -m pip install pandas --no-index -f ../dist + python -c "import pandas; pandas.test()" + cd .. + - name: Upload linux wheel artifact + uses: actions/upload-artifact@v1 + with: + name: ${{ matrix.python-version }}-macos + path: dist \ No newline at end of file diff --git a/manylinux_build.sh b/manylinux_build.sh new file mode 100644 index 0000000..18cb38d --- /dev/null +++ b/manylinux_build.sh @@ -0,0 +1,23 @@ +#!/bin/sh -l + +# Some paths require the period, others dont +PYVER2="${PYVER//.}" + +# Starting in Python38 the ABI version is no longer required +if [ "$PYVER2" = "37" ] || [ "$PYVER2" = "36" ] +then + ABIVER="m" +else + ABIVER="" +fi + +PYLOC=/opt/python/cp${PYVER2}-cp${PYVER2}${ABIVER} + +${PYLOC}/bin/python -m pip install --upgrade pip setuptools wheel auditwheel + +cd /io +${PYLOC}/bin/python setup.py bdist_wheel +# TODO: we can be more prescriptive about the wheel being repaired +for whl in dist/pantab*.whl; do + ${PYLOC}/bin/python -m auditwheel repair "$whl" --plat $PLAT -w /io/wheelhouse/ +done From 594c934849d2aa3284d36085e74c65bffaefcedd Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 09:16:36 -0800 Subject: [PATCH 02/27] format fixup --- .github/workflows/pythonwheels.yml | 88 +++++++++++++++--------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 150326e..a7ae1fa 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -8,56 +8,56 @@ jobs: strategy: matrix: python-version: [3.6, 3.7, 3.8] - steps: - - uses: actions/checkout@master - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - name: Docker Build - run: | - docker run --rm -e PLAT=maylinux1_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/manylinux_build.sh - - name: Install and test wheel - run: | - mkdir temp - cd temp - python -m pip install --upgrade pip - python -m pip install pandas --no-index -f ../wheelhouse - python -c "import pandas; pandas.test()" - cd .. - - name: Upload linux wheel artifact - uses: actions/upload-artifact@v1 - with: - name: ${{ matrix.python-version }}-manylinux - path: wheelhouse + steps: + - uses: actions/checkout@master + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Docker Build + run: | + docker run --rm -e PLAT=maylinux1_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/manylinux_build.sh + - name: Install and test wheel + run: | + mkdir temp + cd temp + python -m pip install --upgrade pip + python -m pip install pandas --no-index -f ../wheelhouse + python -c "import pandas; pandas.test()" + cd .. + - name: Upload linux wheel artifact + uses: actions/upload-artifact@v1 + with: + name: ${{ matrix.python-version }}-manylinux + path: wheelhouse manylinux-i686-wheel: runs-on: ubuntu-latest strategy: matrix: python-version: [3.6, 3.7, 3.8] - steps: - - uses: actions/checkout@master - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - name: Docker Build - run: | - docker run --rm -e PLAT=maylinux1_i686 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/manylinux_build.sh - - name: Install and test wheel - run: | - mkdir temp - cd temp - python -m pip install --upgrade pip - python -m pip install pandas --no-index -f ../wheelhouse - python -c "import pandas; pandas.test()" - cd .. - - name: Upload linux wheel artifact - uses: actions/upload-artifact@v1 - with: - name: ${{ matrix.python-version }}-manylinux - path: wheelhouse + steps: + - uses: actions/checkout@master + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Docker Build + run: | + docker run --rm -e PLAT=maylinux1_i686 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/manylinux_build.sh + - name: Install and test wheel + run: | + mkdir temp + cd temp + python -m pip install --upgrade pip + python -m pip install pandas --no-index -f ../wheelhouse + python -c "import pandas; pandas.test()" + cd .. + - name: Upload linux wheel artifact + uses: actions/upload-artifact@v1 + with: + name: ${{ matrix.python-version }}-manylinux + path: wheelhouse macos-wheel: runs-on: macos-latest From 3017cbeef1d045bd90a2435fd2207a99dc55c89c Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 09:20:26 -0800 Subject: [PATCH 03/27] File permissions --- manylinux_build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 manylinux_build.sh diff --git a/manylinux_build.sh b/manylinux_build.sh old mode 100644 new mode 100755 From 01f66feea61ae0800304faf54703ef0dbeeca02d Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 09:23:45 -0800 Subject: [PATCH 04/27] pandas checkout step --- .github/workflows/pythonwheels.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index a7ae1fa..b012185 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -9,7 +9,10 @@ jobs: matrix: python-version: [3.6, 3.7, 3.8] steps: - - uses: actions/checkout@master + - name: Checkout pandas + uses: actions/checkout@master + with: + repository: pandas-dev/pandas - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: @@ -37,7 +40,10 @@ jobs: matrix: python-version: [3.6, 3.7, 3.8] steps: - - uses: actions/checkout@master + - name: Checkout pandas + uses: actions/checkout@master + with: + repository: pandas-dev/pandas - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: @@ -65,7 +71,10 @@ jobs: matrix: python-version: [3.6, 3.7, 3.8] steps: - - uses: actions/checkout@master + - name: Checkout pandas + uses: actions/checkout@master + with: + repository: pandas-dev/pandas - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: @@ -97,7 +106,10 @@ jobs: matrix: python-version: [3.6, 3.7, 3.8] steps: - - uses: actions/checkout@master + - name: Checkout pandas + uses: actions/checkout@master + with: + repository: pandas-dev/pandas - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: From eb2be49fc61e1197986f7992a23a2427988b15c0 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 09:24:52 -0800 Subject: [PATCH 05/27] typo --- .github/workflows/pythonwheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index b012185..83b1a0c 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -19,7 +19,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Docker Build run: | - docker run --rm -e PLAT=maylinux1_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/manylinux_build.sh + docker run --rm -e PLAT=manylinux1_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/manylinux_build.sh - name: Install and test wheel run: | mkdir temp @@ -50,7 +50,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Docker Build run: | - docker run --rm -e PLAT=maylinux1_i686 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/manylinux_build.sh + docker run --rm -e PLAT=manylinux1_i686 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/manylinux_build.sh - name: Install and test wheel run: | mkdir temp From 4386e7f46af340897bf16ca40a64ffcd574df3df Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 09:38:51 -0800 Subject: [PATCH 06/27] release script --- .github/workflows/pythonwheels.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 83b1a0c..5a632dc 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -13,13 +13,17 @@ jobs: uses: actions/checkout@master with: repository: pandas-dev/pandas + -name: Checkout release repo for build script + uses: actions/checkout@master + with: + path: "pandas-release" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - name: Docker Build run: | - docker run --rm -e PLAT=manylinux1_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/manylinux_build.sh + docker run --rm -e PLAT=manylinux1_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/pandas-release/manylinux_build.sh - name: Install and test wheel run: | mkdir temp @@ -44,13 +48,17 @@ jobs: uses: actions/checkout@master with: repository: pandas-dev/pandas + -name: Checkout release repo for build script + uses: actions/checkout@master + with: + path: "pandas-release" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - name: Docker Build run: | - docker run --rm -e PLAT=manylinux1_i686 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/manylinux_build.sh + docker run --rm -e PLAT=manylinux1_i686 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/pandas-release/manylinux_build.sh - name: Install and test wheel run: | mkdir temp @@ -82,7 +90,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install setuptools wheel + python -m pip install setuptools wheel cython - name: Build wheels run: | python setup.py bdist_wheel @@ -117,7 +125,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install setuptools wheel + python -m pip install setuptools wheel cython - name: Build wheels run: | python setup.py bdist_wheel From 717d6adb37d7d74ba8fcc455734883dd86e6e61b Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 09:39:42 -0800 Subject: [PATCH 07/27] typo fixup --- .github/workflows/pythonwheels.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 5a632dc..2bc3dc5 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -13,10 +13,10 @@ jobs: uses: actions/checkout@master with: repository: pandas-dev/pandas - -name: Checkout release repo for build script - uses: actions/checkout@master - with: - path: "pandas-release" + - name: Checkout release repo for build script + uses: actions/checkout@master + with: + path: "pandas-release" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: @@ -48,10 +48,10 @@ jobs: uses: actions/checkout@master with: repository: pandas-dev/pandas - -name: Checkout release repo for build script - uses: actions/checkout@master - with: - path: "pandas-release" + - name: Checkout release repo for build script + uses: actions/checkout@master + with: + path: "pandas-release" - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v1 with: From e838fea16bcf1c0730d43b1c53bbb64f30ea410b Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 09:41:34 -0800 Subject: [PATCH 08/27] dependencies --- .github/workflows/pythonwheels.yml | 4 ++-- manylinux_build.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 2bc3dc5..c81a18d 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -90,7 +90,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install setuptools wheel cython + python -m pip install setuptools wheel cython numpy python-dateutil pytz - name: Build wheels run: | python setup.py bdist_wheel @@ -125,7 +125,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install setuptools wheel cython + python -m pip install setuptools wheel cython numpy python-dateutil pytz - name: Build wheels run: | python setup.py bdist_wheel diff --git a/manylinux_build.sh b/manylinux_build.sh index 18cb38d..1ee3de4 100755 --- a/manylinux_build.sh +++ b/manylinux_build.sh @@ -14,6 +14,7 @@ fi PYLOC=/opt/python/cp${PYVER2}-cp${PYVER2}${ABIVER} ${PYLOC}/bin/python -m pip install --upgrade pip setuptools wheel auditwheel +${PYLOC}/bin/python -m pip install cython numpy pytz python-dateutil cd /io ${PYLOC}/bin/python setup.py bdist_wheel From e244f6852d31d5c43af149fa1182db9d652c66a6 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 09:53:31 -0800 Subject: [PATCH 09/27] Added testing requirements --- .github/workflows/pythonwheels.yml | 10 ++++++---- manylinux_build.sh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index c81a18d..15286f1 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -29,6 +29,7 @@ jobs: mkdir temp cd temp python -m pip install --upgrade pip + python -m pip install pytest hypothesis python -m pip install pandas --no-index -f ../wheelhouse python -c "import pandas; pandas.test()" cd .. @@ -64,6 +65,7 @@ jobs: mkdir temp cd temp python -m pip install --upgrade pip + python -m pip install pytest hypothesis python -m pip install pandas --no-index -f ../wheelhouse python -c "import pandas; pandas.test()" cd .. @@ -98,11 +100,11 @@ jobs: run: | mkdir temp cd temp - python -m pip install pytest + python -m pip install pytest hypothesis python -m pip install pandas --no-index -f ../dist python -c "import pandas; pandas.test()" cd .. - - name: Upload linux wheel artifact + - name: Upload wheel artifact uses: actions/upload-artifact@v1 with: name: ${{ matrix.python-version }}-macos @@ -133,11 +135,11 @@ jobs: run: | mkdir temp cd temp - python -m pip install pytest + python -m pip install pytest hypothesis python -m pip install pandas --no-index -f ../dist python -c "import pandas; pandas.test()" cd .. - - name: Upload linux wheel artifact + - name: Upload wheel artifact uses: actions/upload-artifact@v1 with: name: ${{ matrix.python-version }}-macos diff --git a/manylinux_build.sh b/manylinux_build.sh index 1ee3de4..970d75f 100755 --- a/manylinux_build.sh +++ b/manylinux_build.sh @@ -19,6 +19,6 @@ ${PYLOC}/bin/python -m pip install cython numpy pytz python-dateutil cd /io ${PYLOC}/bin/python setup.py bdist_wheel # TODO: we can be more prescriptive about the wheel being repaired -for whl in dist/pantab*.whl; do +for whl in dist/pandas*.whl; do ${PYLOC}/bin/python -m auditwheel repair "$whl" --plat $PLAT -w /io/wheelhouse/ done From e6335be5005fc1515c6a7cfdac94b8be2763bc83 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 11:10:01 -0800 Subject: [PATCH 10/27] removed install / testing --- .github/workflows/pythonwheels.yml | 38 ++---------------------------- manylinux_build.sh | 2 +- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 15286f1..99336a6 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -24,15 +24,6 @@ jobs: - name: Docker Build run: | docker run --rm -e PLAT=manylinux1_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/pandas-release/manylinux_build.sh - - name: Install and test wheel - run: | - mkdir temp - cd temp - python -m pip install --upgrade pip - python -m pip install pytest hypothesis - python -m pip install pandas --no-index -f ../wheelhouse - python -c "import pandas; pandas.test()" - cd .. - name: Upload linux wheel artifact uses: actions/upload-artifact@v1 with: @@ -60,15 +51,6 @@ jobs: - name: Docker Build run: | docker run --rm -e PLAT=manylinux1_i686 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/pandas-release/manylinux_build.sh - - name: Install and test wheel - run: | - mkdir temp - cd temp - python -m pip install --upgrade pip - python -m pip install pytest hypothesis - python -m pip install pandas --no-index -f ../wheelhouse - python -c "import pandas; pandas.test()" - cd .. - name: Upload linux wheel artifact uses: actions/upload-artifact@v1 with: @@ -92,18 +74,10 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install setuptools wheel cython numpy python-dateutil pytz + python -m pip install setuptools wheel cython numpy - name: Build wheels run: | python setup.py bdist_wheel - - name: Install and test wheel - run: | - mkdir temp - cd temp - python -m pip install pytest hypothesis - python -m pip install pandas --no-index -f ../dist - python -c "import pandas; pandas.test()" - cd .. - name: Upload wheel artifact uses: actions/upload-artifact@v1 with: @@ -127,18 +101,10 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install setuptools wheel cython numpy python-dateutil pytz + python -m pip install setuptools wheel cython numpy - name: Build wheels run: | python setup.py bdist_wheel - - name: Install and test wheel - run: | - mkdir temp - cd temp - python -m pip install pytest hypothesis - python -m pip install pandas --no-index -f ../dist - python -c "import pandas; pandas.test()" - cd .. - name: Upload wheel artifact uses: actions/upload-artifact@v1 with: diff --git a/manylinux_build.sh b/manylinux_build.sh index 970d75f..2035e67 100755 --- a/manylinux_build.sh +++ b/manylinux_build.sh @@ -14,7 +14,7 @@ fi PYLOC=/opt/python/cp${PYVER2}-cp${PYVER2}${ABIVER} ${PYLOC}/bin/python -m pip install --upgrade pip setuptools wheel auditwheel -${PYLOC}/bin/python -m pip install cython numpy pytz python-dateutil +${PYLOC}/bin/python -m pip install cython numpy cd /io ${PYLOC}/bin/python setup.py bdist_wheel From e4c179f67532393c8a18034e811e2e4bd149f21a Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 11:22:34 -0800 Subject: [PATCH 11/27] new wheel names --- .github/workflows/pythonwheels.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 99336a6..f0bbefb 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -27,7 +27,7 @@ jobs: - name: Upload linux wheel artifact uses: actions/upload-artifact@v1 with: - name: ${{ matrix.python-version }}-manylinux + name: ${{ matrix.python-version }}-manylinux-x86_64 path: wheelhouse manylinux-i686-wheel: @@ -54,7 +54,7 @@ jobs: - name: Upload linux wheel artifact uses: actions/upload-artifact@v1 with: - name: ${{ matrix.python-version }}-manylinux + name: ${{ matrix.python-version }}-manylinux-i686 path: wheelhouse macos-wheel: @@ -108,5 +108,5 @@ jobs: - name: Upload wheel artifact uses: actions/upload-artifact@v1 with: - name: ${{ matrix.python-version }}-macos + name: ${{ matrix.python-version }}-windows path: dist \ No newline at end of file From 35d7b1106c577a6bc3f59009690fa5c7020f2bd0 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 21:15:15 -0800 Subject: [PATCH 12/27] updates --- .github/workflows/pythonwheels.yml | 47 ++++++++++-------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index f0bbefb..b2d7ff1 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -23,38 +23,15 @@ jobs: python-version: ${{ matrix.python-version }} - name: Docker Build run: | - docker run --rm -e PLAT=manylinux1_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_x86_64 /io/pandas-release/manylinux_build.sh - - name: Upload linux wheel artifact - uses: actions/upload-artifact@v1 - with: - name: ${{ matrix.python-version }}-manylinux-x86_64 - path: wheelhouse - - manylinux-i686-wheel: - runs-on: ubuntu-latest - strategy: - matrix: - python-version: [3.6, 3.7, 3.8] - steps: - - name: Checkout pandas - uses: actions/checkout@master - with: - repository: pandas-dev/pandas - - name: Checkout release repo for build script - uses: actions/checkout@master - with: - path: "pandas-release" - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - name: Docker Build + docker run --rm -e PLAT=manylinux2010_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/pandas-release/manylinux_build.sh + - name: Install and verify wheel run: | - docker run --rm -e PLAT=manylinux1_i686 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux1_i686 /io/pandas-release/manylinux_build.sh + python -m pip install pandas --no-index -f wheelhouse + python -c "import pandas" - name: Upload linux wheel artifact uses: actions/upload-artifact@v1 with: - name: ${{ matrix.python-version }}-manylinux-i686 + name: wheels path: wheelhouse macos-wheel: @@ -73,15 +50,18 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install --upgrade pip python -m pip install setuptools wheel cython numpy - name: Build wheels run: | python setup.py bdist_wheel + - name: Install and verify wheel + run: | + python -m pip install pandas --no-index -f wheelhouse + python -c "import pandas" - name: Upload wheel artifact uses: actions/upload-artifact@v1 with: - name: ${{ matrix.python-version }}-macos + name: wheels path: dist windows-wheel: @@ -100,13 +80,16 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install --upgrade pip python -m pip install setuptools wheel cython numpy - name: Build wheels run: | python setup.py bdist_wheel + - name: Install and verify wheel + run: | + python -m pip install pandas --no-index -f wheelhouse + python -c "import pandas" - name: Upload wheel artifact uses: actions/upload-artifact@v1 with: - name: ${{ matrix.python-version }}-windows + name: wheels path: dist \ No newline at end of file From 91b151a6b4a00df10aa8947c37978ccd5f9ee346 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 21:23:23 -0800 Subject: [PATCH 13/27] req installs --- .github/workflows/pythonwheels.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index b2d7ff1..50121ec 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -26,6 +26,7 @@ jobs: docker run --rm -e PLAT=manylinux2010_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/pandas-release/manylinux_build.sh - name: Install and verify wheel run: | + python -m pip install pytz python-dateutil numpy python -m pip install pandas --no-index -f wheelhouse python -c "import pandas" - name: Upload linux wheel artifact @@ -56,6 +57,7 @@ jobs: python setup.py bdist_wheel - name: Install and verify wheel run: | + python -m pip install pytz python-dateutil python -m pip install pandas --no-index -f wheelhouse python -c "import pandas" - name: Upload wheel artifact @@ -86,6 +88,7 @@ jobs: python setup.py bdist_wheel - name: Install and verify wheel run: | + python -m pip install pytz python-dateutil python -m pip install pandas --no-index -f wheelhouse python -c "import pandas" - name: Upload wheel artifact From 62fc6604d75874da455320433e1cdf56f32a1008 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 21:36:24 -0800 Subject: [PATCH 14/27] build updates --- .github/workflows/pythonwheels.yml | 9 ++++----- manylinux_build.sh | 1 + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 50121ec..32afc10 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -26,7 +26,6 @@ jobs: docker run --rm -e PLAT=manylinux2010_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/pandas-release/manylinux_build.sh - name: Install and verify wheel run: | - python -m pip install pytz python-dateutil numpy python -m pip install pandas --no-index -f wheelhouse python -c "import pandas" - name: Upload linux wheel artifact @@ -54,11 +53,11 @@ jobs: python -m pip install setuptools wheel cython numpy - name: Build wheels run: | + python setup.py build_ext --inplace -j 4 python setup.py bdist_wheel - name: Install and verify wheel run: | - python -m pip install pytz python-dateutil - python -m pip install pandas --no-index -f wheelhouse + python -m pip install pandas --no-index -f dist python -c "import pandas" - name: Upload wheel artifact uses: actions/upload-artifact@v1 @@ -85,11 +84,11 @@ jobs: python -m pip install setuptools wheel cython numpy - name: Build wheels run: | + python setup.py build_ext --inplace -j 4 python setup.py bdist_wheel - name: Install and verify wheel run: | - python -m pip install pytz python-dateutil - python -m pip install pandas --no-index -f wheelhouse + python -m pip install pandas --no-index -f dist python -c "import pandas" - name: Upload wheel artifact uses: actions/upload-artifact@v1 diff --git a/manylinux_build.sh b/manylinux_build.sh index 2035e67..71e73b6 100755 --- a/manylinux_build.sh +++ b/manylinux_build.sh @@ -17,6 +17,7 @@ ${PYLOC}/bin/python -m pip install --upgrade pip setuptools wheel auditwheel ${PYLOC}/bin/python -m pip install cython numpy cd /io +${PYLOC}/bin/python setup.py build_ext --inplace -j 4 ${PYLOC}/bin/python setup.py bdist_wheel # TODO: we can be more prescriptive about the wheel being repaired for whl in dist/pandas*.whl; do From c73481907f2b2915fe5ad1075f78f1595fa0fc36 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 21:37:29 -0800 Subject: [PATCH 15/27] Removed build_ext --- .github/workflows/pythonwheels.yml | 2 -- manylinux_build.sh | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 32afc10..5e42873 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -53,7 +53,6 @@ jobs: python -m pip install setuptools wheel cython numpy - name: Build wheels run: | - python setup.py build_ext --inplace -j 4 python setup.py bdist_wheel - name: Install and verify wheel run: | @@ -84,7 +83,6 @@ jobs: python -m pip install setuptools wheel cython numpy - name: Build wheels run: | - python setup.py build_ext --inplace -j 4 python setup.py bdist_wheel - name: Install and verify wheel run: | diff --git a/manylinux_build.sh b/manylinux_build.sh index 71e73b6..2035e67 100755 --- a/manylinux_build.sh +++ b/manylinux_build.sh @@ -17,7 +17,6 @@ ${PYLOC}/bin/python -m pip install --upgrade pip setuptools wheel auditwheel ${PYLOC}/bin/python -m pip install cython numpy cd /io -${PYLOC}/bin/python setup.py build_ext --inplace -j 4 ${PYLOC}/bin/python setup.py bdist_wheel # TODO: we can be more prescriptive about the wheel being repaired for whl in dist/pandas*.whl; do From 0ab6c385859fa754b8d0e29cda66883e468e819a Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 21:44:38 -0800 Subject: [PATCH 16/27] dateutil --- .github/workflows/pythonwheels.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 5e42873..3d671f5 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -26,6 +26,7 @@ jobs: docker run --rm -e PLAT=manylinux2010_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/pandas-release/manylinux_build.sh - name: Install and verify wheel run: | + python -m pip install pytz python-dateutil python -m pip install pandas --no-index -f wheelhouse python -c "import pandas" - name: Upload linux wheel artifact @@ -56,6 +57,7 @@ jobs: python setup.py bdist_wheel - name: Install and verify wheel run: | + python -m pip install pytz python-dateutil python -m pip install pandas --no-index -f dist python -c "import pandas" - name: Upload wheel artifact @@ -86,6 +88,7 @@ jobs: python setup.py bdist_wheel - name: Install and verify wheel run: | + python -m pip install pytz python-dateutil python -m pip install pandas --no-index -f dist python -c "import pandas" - name: Upload wheel artifact From 191b7250e6d1cb000688ba2ec5b51e31377e869b Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 21:58:04 -0800 Subject: [PATCH 17/27] install fixup --- .github/workflows/pythonwheels.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 3d671f5..44441d4 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -27,8 +27,12 @@ jobs: - name: Install and verify wheel run: | python -m pip install pytz python-dateutil - python -m pip install pandas --no-index -f wheelhouse + # cd to not install the local unbuilt pandas directory + mkdir temp + cd temp + python -m pip install pandas --no-index -f ../wheelhouse python -c "import pandas" + cd .. - name: Upload linux wheel artifact uses: actions/upload-artifact@v1 with: @@ -58,8 +62,12 @@ jobs: - name: Install and verify wheel run: | python -m pip install pytz python-dateutil + # cd to not install the local unbuilt pandas directory + mkdir temp + cd temp python -m pip install pandas --no-index -f dist python -c "import pandas" + cd .. - name: Upload wheel artifact uses: actions/upload-artifact@v1 with: @@ -89,8 +97,12 @@ jobs: - name: Install and verify wheel run: | python -m pip install pytz python-dateutil + # cd to not install the local unbuilt pandas directory + mkdir temp + cd temp python -m pip install pandas --no-index -f dist python -c "import pandas" + cd .. - name: Upload wheel artifact uses: actions/upload-artifact@v1 with: From a5aa624b526e6d73276621027e4880566f47c9b7 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 22:00:50 -0800 Subject: [PATCH 18/27] install dir fixup --- .github/workflows/pythonwheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 44441d4..0ea32af 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -65,7 +65,7 @@ jobs: # cd to not install the local unbuilt pandas directory mkdir temp cd temp - python -m pip install pandas --no-index -f dist + python -m pip install pandas --no-index -f ../dist python -c "import pandas" cd .. - name: Upload wheel artifact @@ -100,7 +100,7 @@ jobs: # cd to not install the local unbuilt pandas directory mkdir temp cd temp - python -m pip install pandas --no-index -f dist + python -m pip install pandas --no-index -f ../dist python -c "import pandas" cd .. - name: Upload wheel artifact From 9dcded9525da64d9c1f3a11bbd930325d298fdef Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Wed, 12 Feb 2020 22:14:18 -0800 Subject: [PATCH 19/27] linux fixup --- .github/workflows/pythonwheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 0ea32af..f5e2b1a 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -26,7 +26,7 @@ jobs: docker run --rm -e PLAT=manylinux2010_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/pandas-release/manylinux_build.sh - name: Install and verify wheel run: | - python -m pip install pytz python-dateutil + python -m pip install numpy pytz python-dateutil # cd to not install the local unbuilt pandas directory mkdir temp cd temp From 323e88f21b84094646b5e33f4a62dfaf4a321b5c Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Thu, 13 Feb 2020 12:45:33 -0800 Subject: [PATCH 20/27] leave to pyproject.toml --- .github/workflows/pythonwheels.yml | 6 ------ manylinux_build.sh | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index f5e2b1a..acb2c6d 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -53,9 +53,6 @@ jobs: uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install setuptools wheel cython numpy - name: Build wheels run: | python setup.py bdist_wheel @@ -88,9 +85,6 @@ jobs: uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install setuptools wheel cython numpy - name: Build wheels run: | python setup.py bdist_wheel diff --git a/manylinux_build.sh b/manylinux_build.sh index 2035e67..16f0a52 100755 --- a/manylinux_build.sh +++ b/manylinux_build.sh @@ -13,8 +13,7 @@ fi PYLOC=/opt/python/cp${PYVER2}-cp${PYVER2}${ABIVER} -${PYLOC}/bin/python -m pip install --upgrade pip setuptools wheel auditwheel -${PYLOC}/bin/python -m pip install cython numpy +${PYLOC}/bin/python -m pip install auditwheel cd /io ${PYLOC}/bin/python setup.py bdist_wheel From bb988c93c4cd5bb734c4c5a49b023a6817179ba5 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Thu, 13 Feb 2020 18:43:08 -0800 Subject: [PATCH 21/27] min numpy version --- .github/workflows/pythonwheels.yml | 6 ++++++ manylinux_build.sh | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index acb2c6d..f5dd52c 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -53,6 +53,9 @@ jobs: uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install setuptools wheel cython numpy=1.13.3 - name: Build wheels run: | python setup.py bdist_wheel @@ -85,6 +88,9 @@ jobs: uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install setuptools wheel cython numpy=1.13.3 - name: Build wheels run: | python setup.py bdist_wheel diff --git a/manylinux_build.sh b/manylinux_build.sh index 16f0a52..cb02581 100755 --- a/manylinux_build.sh +++ b/manylinux_build.sh @@ -13,7 +13,8 @@ fi PYLOC=/opt/python/cp${PYVER2}-cp${PYVER2}${ABIVER} -${PYLOC}/bin/python -m pip install auditwheel +${PYLOC}/bin/python -m pip install --upgrade pip setuptools wheel auditwheel +${PYLOC}/bin/python -m pip install cython numpy=1.13.3 cd /io ${PYLOC}/bin/python setup.py bdist_wheel From 7354b2fd57a400416dbe8d0e687f6cec30397793 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Fri, 14 Feb 2020 08:46:04 -0800 Subject: [PATCH 22/27] op fixup --- .github/workflows/pythonwheels.yml | 4 ++-- manylinux_build.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index f5dd52c..faa9d1a 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -55,7 +55,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install setuptools wheel cython numpy=1.13.3 + python -m pip install setuptools wheel cython numpy==1.13.3 - name: Build wheels run: | python setup.py bdist_wheel @@ -90,7 +90,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install setuptools wheel cython numpy=1.13.3 + python -m pip install setuptools wheel cython numpy==1.13.3 - name: Build wheels run: | python setup.py bdist_wheel diff --git a/manylinux_build.sh b/manylinux_build.sh index cb02581..ff7395f 100755 --- a/manylinux_build.sh +++ b/manylinux_build.sh @@ -14,7 +14,7 @@ fi PYLOC=/opt/python/cp${PYVER2}-cp${PYVER2}${ABIVER} ${PYLOC}/bin/python -m pip install --upgrade pip setuptools wheel auditwheel -${PYLOC}/bin/python -m pip install cython numpy=1.13.3 +${PYLOC}/bin/python -m pip install cython numpy==1.13.3 cd /io ${PYLOC}/bin/python setup.py bdist_wheel From 7c8b2292065c0d7b24a6fab74a7f8221ff83e245 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 18 Feb 2020 21:12:49 -0500 Subject: [PATCH 23/27] numpy versions --- .github/workflows/pythonwheels.yml | 61 +++++++++++------------------- manylinux_build.sh | 2 +- 2 files changed, 23 insertions(+), 40 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index faa9d1a..9cefe6a 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -8,6 +8,15 @@ jobs: strategy: matrix: python-version: [3.6, 3.7, 3.8] + include: + # Set the appropriate min numpy for each python version + # Should ideally let pyproject.toml take care of this + - python-version: 3.6 + min-numpy: 1.13.3 + - python-version: 3.7 + min-numpy: 1.14.5 + - python-version: 3.8 + min-numpy: 1.16.0 steps: - name: Checkout pandas uses: actions/checkout@master @@ -23,7 +32,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Docker Build run: | - docker run --rm -e PLAT=manylinux2010_x86_64 -e PYVER=${{ matrix.python-version }} -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/pandas-release/manylinux_build.sh + docker run --rm -e PLAT=manylinux2010_x86_64 -e PYVER=${{ matrix.python-version }} NPVER=${{ matrix.min-numpy }} -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/pandas-release/manylinux_build.sh - name: Install and verify wheel run: | python -m pip install numpy pytz python-dateutil @@ -39,11 +48,20 @@ jobs: name: wheels path: wheelhouse - macos-wheel: - runs-on: macos-latest + non-linux-wheels: strategy: matrix: + os: [macos-latest, windows-latest] python-version: [3.6, 3.7, 3.8] + include: + # Set the appropriate min numpy for each python version + # Should ideally let pyproject.toml take care of this + - python-version: 3.6 + min-numpy: 1.13.3 + - python-version: 3.7 + min-numpy: 1.14.5 + - python-version: 3.8 + min-numpy: 1.16.0 steps: - name: Checkout pandas uses: actions/checkout@master @@ -55,7 +73,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install setuptools wheel cython numpy==1.13.3 + python -m pip install setuptools wheel cython numpy==${{ matrix.min-numpy }} - name: Build wheels run: | python setup.py bdist_wheel @@ -73,38 +91,3 @@ jobs: with: name: wheels path: dist - - windows-wheel: - runs-on: windows-latest - strategy: - matrix: - python-version: [3.6, 3.7, 3.8] - steps: - - name: Checkout pandas - uses: actions/checkout@master - with: - repository: pandas-dev/pandas - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install setuptools wheel cython numpy==1.13.3 - - name: Build wheels - run: | - python setup.py bdist_wheel - - name: Install and verify wheel - run: | - python -m pip install pytz python-dateutil - # cd to not install the local unbuilt pandas directory - mkdir temp - cd temp - python -m pip install pandas --no-index -f ../dist - python -c "import pandas" - cd .. - - name: Upload wheel artifact - uses: actions/upload-artifact@v1 - with: - name: wheels - path: dist \ No newline at end of file diff --git a/manylinux_build.sh b/manylinux_build.sh index ff7395f..c615861 100755 --- a/manylinux_build.sh +++ b/manylinux_build.sh @@ -14,7 +14,7 @@ fi PYLOC=/opt/python/cp${PYVER2}-cp${PYVER2}${ABIVER} ${PYLOC}/bin/python -m pip install --upgrade pip setuptools wheel auditwheel -${PYLOC}/bin/python -m pip install cython numpy==1.13.3 +${PYLOC}/bin/python -m pip install cython numpy=="$NPVER" cd /io ${PYLOC}/bin/python setup.py bdist_wheel From 069f46a1aadc82f17d50b6d0f59c7db6194a5b67 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 18 Feb 2020 21:14:04 -0500 Subject: [PATCH 24/27] runs-on os --- .github/workflows/pythonwheels.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 9cefe6a..1645b94 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -49,6 +49,7 @@ jobs: path: wheelhouse non-linux-wheels: + runs-on: ${{ matrix.os }} strategy: matrix: os: [macos-latest, windows-latest] From faa561a47cfa0d78ad4babd433909940cee0ff60 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 18 Feb 2020 21:14:59 -0500 Subject: [PATCH 25/27] env flag --- .github/workflows/pythonwheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 1645b94..0123e60 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -32,7 +32,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Docker Build run: | - docker run --rm -e PLAT=manylinux2010_x86_64 -e PYVER=${{ matrix.python-version }} NPVER=${{ matrix.min-numpy }} -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/pandas-release/manylinux_build.sh + docker run --rm -e PLAT=manylinux2010_x86_64 -e PYVER=${{ matrix.python-version }} -e NPVER=${{ matrix.min-numpy }} -v `pwd`:/io quay.io/pypa/manylinux2010_x86_64 /io/pandas-release/manylinux_build.sh - name: Install and verify wheel run: | python -m pip install numpy pytz python-dateutil From f72c757d7a39afc458d76da15ed95758581b3acd Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 18 Feb 2020 21:50:13 -0500 Subject: [PATCH 26/27] mac environment variable --- .github/workflows/pythonwheels.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index 0123e60..baa3757 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -78,6 +78,9 @@ jobs: - name: Build wheels run: | python setup.py bdist_wheel + # Set environment variable for macOS; no effect on windows + env: + MACOSX_DEPLOYMENT_TARGET: 10.9 - name: Install and verify wheel run: | python -m pip install pytz python-dateutil From 1040c911afa1d2435bb7354eb7b4d81cf4bd92e8 Mon Sep 17 00:00:00 2001 From: Will Ayd Date: Tue, 18 Feb 2020 21:55:45 -0500 Subject: [PATCH 27/27] moved env set --- .github/workflows/pythonwheels.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pythonwheels.yml b/.github/workflows/pythonwheels.yml index baa3757..caac196 100644 --- a/.github/workflows/pythonwheels.yml +++ b/.github/workflows/pythonwheels.yml @@ -2,6 +2,9 @@ name: Create Platform Wheels on: [push] +env: + MACOSX_DEPLOYMENT_TARGET: 10.9 + jobs: manylinux-x86_64-wheel: runs-on: ubuntu-latest @@ -78,9 +81,6 @@ jobs: - name: Build wheels run: | python setup.py bdist_wheel - # Set environment variable for macOS; no effect on windows - env: - MACOSX_DEPLOYMENT_TARGET: 10.9 - name: Install and verify wheel run: | python -m pip install pytz python-dateutil