From 79f6f7fac904a6c9fac1a2916a73ae3db2204dc0 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Tue, 21 Jun 2022 20:35:48 +0900 Subject: [PATCH 1/3] Update CI settings --- .github/workflows/windows.yaml | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index ac9b28da..6ff61234 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -10,7 +10,7 @@ jobs: build: runs-on: windows-latest env: - CONNECTOR_VERSION: "3.2.4" + CONNECTOR_VERSION: "3.3.1" steps: - name: Cache Connector @@ -57,18 +57,25 @@ jobs: EOF cat site.cfg + - uses: actions/setup-python@v2 + - name: Install cibuildwheel + run: python -m pip install cibuildwheel==2.7.0 - name: Build wheels - shell: cmd working-directory: mysqlclient - run: | - py -3.10 -m pip install -U setuptools wheel pip - py -3.10 setup.py bdist_wheel - py -3.9 -m pip install -U setuptools wheel pip - py -3.9 setup.py bdist_wheel - py -3.8 -m pip install -U setuptools wheel pip - py -3.8 setup.py bdist_wheel - py -3.7 -m pip install -U setuptools wheel pip - py -3.7 setup.py bdist_wheel + run: python -m cibuildwheel --output-dir dist + + #- name: Build wheels + # shell: cmd + # working-directory: mysqlclient + # run: | + # py -3.10 -m pip install -U setuptools wheel pip + # py -3.10 setup.py bdist_wheel + # py -3.9 -m pip install -U setuptools wheel pip + # py -3.9 setup.py bdist_wheel + # py -3.8 -m pip install -U setuptools wheel pip + # py -3.8 setup.py bdist_wheel + # py -3.7 -m pip install -U setuptools wheel pip + # py -3.7 setup.py bdist_wheel - name: Upload Wheel uses: actions/upload-artifact@v2 @@ -81,6 +88,8 @@ jobs: working-directory: mysqlclient/dist run: | ls -la + py -3.11 -m pip install --no-index --find-links . mysqlclient + py -3.11 -c "import MySQLdb; print(MySQLdb.version_info)" py -3.10 -m pip install --no-index --find-links . mysqlclient py -3.10 -c "import MySQLdb; print(MySQLdb.version_info)" py -3.9 -m pip install --no-index --find-links . mysqlclient From a70736639a4ca857c553011fce461e8a4e3e138a Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Tue, 21 Jun 2022 20:45:04 +0900 Subject: [PATCH 2/3] fixup --- .github/workflows/windows.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 6ff61234..870e25a3 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -62,7 +62,10 @@ jobs: run: python -m pip install cibuildwheel==2.7.0 - name: Build wheels working-directory: mysqlclient - run: python -m cibuildwheel --output-dir dist + env: + CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8" + CIBW_ARCHS_WINDOWS: "AMD64" + run: python -m cibuildwheel --prerelease-pythons --output-dir dist #- name: Build wheels # shell: cmd From 33b8f702ac3291054dcf3056dea77a2c5066c4c6 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 22 Jun 2022 08:51:24 +0900 Subject: [PATCH 3/3] fix --- .github/workflows/windows.yaml | 36 ++++------------------------------ 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 870e25a3..e2314b44 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -4,6 +4,7 @@ on: push: branches: - master + - ci workflow_dispatch: jobs: @@ -64,41 +65,12 @@ jobs: working-directory: mysqlclient env: CIBW_PROJECT_REQUIRES_PYTHON: ">=3.8" - CIBW_ARCHS_WINDOWS: "AMD64" - run: python -m cibuildwheel --prerelease-pythons --output-dir dist - - #- name: Build wheels - # shell: cmd - # working-directory: mysqlclient - # run: | - # py -3.10 -m pip install -U setuptools wheel pip - # py -3.10 setup.py bdist_wheel - # py -3.9 -m pip install -U setuptools wheel pip - # py -3.9 setup.py bdist_wheel - # py -3.8 -m pip install -U setuptools wheel pip - # py -3.8 setup.py bdist_wheel - # py -3.7 -m pip install -U setuptools wheel pip - # py -3.7 setup.py bdist_wheel + CIBW_ARCHS: "AMD64" + CIBW_TEST_COMMAND: "python -c \"import MySQLdb; print(MySQLdb.version_info)\" " + run: "python -m cibuildwheel --prerelease-pythons --output-dir dist" - name: Upload Wheel uses: actions/upload-artifact@v2 with: name: win-wheels path: mysqlclient/dist/*.whl - - - name: Check wheels - shell: bash - working-directory: mysqlclient/dist - run: | - ls -la - py -3.11 -m pip install --no-index --find-links . mysqlclient - py -3.11 -c "import MySQLdb; print(MySQLdb.version_info)" - py -3.10 -m pip install --no-index --find-links . mysqlclient - py -3.10 -c "import MySQLdb; print(MySQLdb.version_info)" - py -3.9 -m pip install --no-index --find-links . mysqlclient - py -3.9 -c "import MySQLdb; print(MySQLdb.version_info)" - py -3.8 -m pip install --no-index --find-links . mysqlclient - py -3.8 -c "import MySQLdb; print(MySQLdb.version_info)" - py -3.7 -m pip install --no-index --find-links . mysqlclient - py -3.7 -c "import MySQLdb; print(MySQLdb.version_info)" -