Skip to content

Remove testing on MyISAM #1180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 6, 2025
Merged

Remove testing on MyISAM #1180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ jobs:
python: '3.10'
allow_failure: false

- name: py311-dj51-mysql_innodb-coverage
- name: py311-dj51-mysql-coverage
python: '3.11'
allow_failure: false

- name: py310-dj42-mysql_innodb-coverage
- name: py310-dj42-mysql-coverage
python: '3.10'
allow_failure: false

- name: py39-dj42-mysql_innodb-xdist-coverage
- name: py39-dj42-mysql-xdist-coverage
python: '3.9'
allow_failure: false

Expand All @@ -135,10 +135,6 @@ jobs:
python: '3.8'
allow_failure: false

- name: py311-dj42-mysql_myisam-coverage
python: '3.11'
allow_failure: false

# Explicitly test min pytest.
- name: py38-dj42-sqlite-pytestmin-coverage
python: '3.8'
Expand Down
4 changes: 2 additions & 2 deletions docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ v4.11.0 (Not released yet)
Compatibility
^^^^^^^^^^^^^

* Added official support for Django 5.2.

* Added official support for Django 5.2 (`PR #1179 <https://github.com/pytest-dev/pytest-django/pull/1179>`__).
* Dropped testing on MySQL’s MyISAM storage engine (`PR #1180 <https://github.com/pytest-dev/pytest-django/pull/1180>`__).

v4.10.0 (2025-02-10)
--------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/contributing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ writing), running them all will take a long time. All valid configurations can
be found in `tox.ini`. To test against a few of them, invoke tox with the `-e`
flag::

$ tox -e py38-dj32-postgres,py310-dj41-mysql_innodb
$ tox -e py38-dj32-postgres,py310-dj41-mysql

This will run the tests on Python 3.8/Django 3.2/PostgeSQL and Python
3.10/Django 4.1/MySQL.
Expand Down
3 changes: 0 additions & 3 deletions pytest_django_test/settings_mysql_innodb.py → pytest_django_test/settings_mysql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"PASSWORD": environ.get("TEST_DB_PASSWORD", ""),
"HOST": environ.get("TEST_DB_HOST", "localhost"),
"OPTIONS": {
"init_command": "SET default_storage_engine=InnoDB",
Copy link
Member Author

@adamchainz adamchainz Mar 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was always unnecessary because it's been the default in MySQL for a long time.

"charset": "utf8mb4",
},
"TEST": {
Expand All @@ -26,7 +25,6 @@
"PASSWORD": environ.get("TEST_DB_PASSWORD", ""),
"HOST": environ.get("TEST_DB_HOST", "localhost"),
"OPTIONS": {
"init_command": "SET default_storage_engine=InnoDB",
"charset": "utf8mb4",
},
"TEST": {
Expand All @@ -42,7 +40,6 @@
"PASSWORD": environ.get("TEST_DB_PASSWORD", ""),
"HOST": environ.get("TEST_DB_HOST", "localhost"),
"OPTIONS": {
"init_command": "SET default_storage_engine=InnoDB",
"charset": "utf8mb4",
},
"TEST": {
Expand Down
53 changes: 0 additions & 53 deletions pytest_django_test/settings_mysql_myisam.py
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ deps =
dj50: Django>=5.0,<5.1
dj42: Django>=4.2,<4.3

mysql_myisam: mysqlclient==2.1.0
mysql_innodb: mysqlclient==2.1.0
mysql: mysqlclient==2.1.0

postgres: psycopg[binary]
coverage: coverage[toml]
Expand All @@ -28,8 +27,7 @@ deps =
xdist: pytest-xdist>=1.15

setenv =
mysql_innodb: DJANGO_SETTINGS_MODULE=pytest_django_test.settings_mysql_innodb
mysql_myisam: DJANGO_SETTINGS_MODULE=pytest_django_test.settings_mysql_myisam
mysql: DJANGO_SETTINGS_MODULE=pytest_django_test.settings_mysql
postgres: DJANGO_SETTINGS_MODULE=pytest_django_test.settings_postgres
sqlite: DJANGO_SETTINGS_MODULE=pytest_django_test.settings_sqlite
sqlite_file: DJANGO_SETTINGS_MODULE=pytest_django_test.settings_sqlite_file
Expand Down