diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index cf784c78..079c9094 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -2,7 +2,7 @@ name: Test on: push: - branches: ["main"] + branches: ['main'] pull_request: jobs: @@ -13,9 +13,9 @@ jobs: PIP_DISABLE_PIP_VERSION_CHECK: 1 strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"] + python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14'] include: - - python-version: "3.12" + - python-version: '3.12' mariadb: 1 steps: - if: ${{ matrix.mariadb }} @@ -41,8 +41,8 @@ jobs: uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - cache: "pip" - cache-dependency-path: "requirements.txt" + cache: 'pip' + cache-dependency-path: 'requirements.txt' allow-prereleases: true - name: Install mysqlclient @@ -52,7 +52,7 @@ jobs: - name: Install test dependencies run: | pip install -r requirements.txt - + - name: Run tests env: TESTDB: actions.cnf @@ -62,13 +62,13 @@ jobs: - uses: codecov/codecov-action@v5 django-test: - name: "Run Django LTS test suite" + name: 'Run Django LTS test suite' needs: test runs-on: ubuntu-latest env: PIP_NO_PYTHON_VERSION_WARNING: 1 PIP_DISABLE_PIP_VERSION_CHECK: 1 - DJANGO_VERSION: "4.2.16" + DJANGO_VERSION: '4.2.16' steps: - name: Start MySQL run: | @@ -83,9 +83,9 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.12" - cache: "pip" - cache-dependency-path: "ci/django-requirements.txt" + python-version: '3.12' + cache: 'pip' + cache-dependency-path: 'ci/django-requirements.txt' - name: Install mysqlclient run: | diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index f8dbf87a..81dbbe5c 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -2,7 +2,7 @@ name: Build windows wheels on: push: - branches: ["main", "ci"] + branches: ['main', 'ci'] pull_request: workflow_dispatch: @@ -10,7 +10,7 @@ jobs: build: runs-on: windows-latest env: - CONNECTOR_VERSION: "3.4.1" + CONNECTOR_VERSION: '3.4.7' steps: - name: Cache Connector id: cache-connector @@ -74,15 +74,18 @@ jobs: cat site.cfg - uses: actions/setup-python@v5 + with: + python-version: '3.14.0' - name: Install cibuildwheel - run: python -m pip install cibuildwheel + run: python -m pip install --upgrade cibuildwheel - name: Build wheels working-directory: mysqlclient env: - CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9" - CIBW_ARCHS: "AMD64" + CIBW_PROJECT_REQUIRES_PYTHON: '>=3.9' + CIBW_ARCHS: 'AMD64' + CIBW_BUILD: 'cp3*-win_amd64' CIBW_TEST_COMMAND: 'python -c "import MySQLdb; print(MySQLdb.version_info)" ' - run: "python -m cibuildwheel --prerelease-pythons --output-dir dist" + run: 'python -m cibuildwheel --output-dir dist' - name: Build sdist working-directory: mysqlclient diff --git a/ci/test_mysql.py b/ci/test_mysql.py index 498be7cf..18d213ac 100644 --- a/ci/test_mysql.py +++ b/ci/test_mysql.py @@ -19,7 +19,7 @@ "HOST": "127.0.0.1", "USER": "scott", "PASSWORD": "tiger", - "TEST": {"CHARSET": "utf8mb3", "COLLATION": "utf8mb3_general_ci"}, + "TEST": {"CHARSET": "utf8mb4", "COLLATION": "utf8mb4_general_ci"}, }, "other": { "ENGINE": "django.db.backends.mysql", @@ -27,7 +27,7 @@ "HOST": "127.0.0.1", "USER": "scott", "PASSWORD": "tiger", - "TEST": {"CHARSET": "utf8mb3", "COLLATION": "utf8mb3_general_ci"}, + "TEST": {"CHARSET": "utf8mb4", "COLLATION": "utf8mb4_general_ci"}, }, }