Skip to content

Commit

Permalink
Merge "Alembic 1.13 now supports Python 3.8 and above" into main
Browse files Browse the repository at this point in the history
  • Loading branch information
zzzeek authored and Gerrit Code Review committed Nov 18, 2023
2 parents 1400489 + b19ac41 commit 885f29a
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 27 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/run-on-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ jobs:
# steps to run in each job. Some are github actions, others run shell commands
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.architecture }}
Expand Down Expand Up @@ -67,10 +67,10 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.architecture }}
Expand Down
15 changes: 10 additions & 5 deletions .github/workflows/run-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,25 +30,29 @@ jobs:
- "windows-latest"
- "macos-latest"
python-version:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
- "3.11"
- "3.12"
sqlalchemy:
- sqla13
- sqla14
- sqlamain
exclude:
# sqla13 does not seem to support 3.12
- sqlalchemy: sqla13
python-version: "3.12"

fail-fast: false

# steps to run in each job. Some are github actions, others run shell commands
steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.architecture }}
Expand All @@ -73,15 +77,16 @@ jobs:
- "3.9"
- "3.10"
- "3.11"
- "3.12"

fail-fast: false

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.architecture }}
Expand Down
10 changes: 5 additions & 5 deletions README.unittests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@ Advanced Tox Options

For more elaborate CI-style test running, the tox script provided will
run against various Python / database targets. For a basic run against
Python 3.9 using an in-memory SQLite database::
Python 3.11 using an in-memory SQLite database::

tox -e py39-sqlite
tox -e py311-sqlite

The tox runner contains a series of target combinations that can run
against various combinations of databases. The test suite can be
run against SQLite with "backend" tests also running against a PostgreSQL
database::

tox -e py39-sqlite-postgresql
tox -e py311-sqlite-postgresql

Or to run just "backend" tests against a MySQL database::

tox -e py39-mysql-backendonly
tox -e py311-mysql-backendonly

Running against backends other than SQLite requires that a database of that
vendor be available at a specific URL. See "Setting Up Databases" below
Expand Down Expand Up @@ -131,7 +131,7 @@ with the tox runner also::
[db]
postgresql=postgresql://username:pass@hostname/dbname

Now when we run ``tox -e py39-postgresql``, it will use our custom URL instead
Now when we run ``tox -e py311-postgresql``, it will use our custom URL instead
of the fixed one in setup.cfg.

Database Configuration
Expand Down
4 changes: 1 addition & 3 deletions alembic/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import sys

from . import context
from . import op

__version__ = "1.12.2"
__version__ = "1.13.0"
1 change: 0 additions & 1 deletion alembic/util/compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
py311 = sys.version_info >= (3, 11)
py310 = sys.version_info >= (3, 10)
py39 = sys.version_info >= (3, 9)
py38 = sys.version_info >= (3, 8)


# produce a wrapper that allows encoded text to stream
Expand Down
2 changes: 0 additions & 2 deletions docs/build/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,6 @@
# latex_use_modindex = True


# {'python': ('http://docs.python.org/3.2', None)}

autoclass_content = "both"

intersphinx_mapping = {
Expand Down
6 changes: 2 additions & 4 deletions docs/build/front.rst
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,9 @@ SQLAlchemy as of version **1.3.0**.

.. versionchanged:: 1.5.0 Support for SQLAlchemy older than 1.3.0 was dropped.

Alembic supports Python versions **3.7 and above**
Alembic supports Python versions **3.8 and above**

.. versionchanged:: 1.8 Alembic now supports Python 3.7 and newer.
.. versionchanged:: 1.7 Alembic now supports Python 3.6 and newer; support
for Python 2.7 has been dropped.
.. versionchanged:: 1.13 Alembic now supports Python 3.8 and newer.

.. _versioning_scheme:

Expand Down
2 changes: 1 addition & 1 deletion docs/build/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ git+https://github.com/sqlalchemy/sqlalchemy.git
python-dateutil
# because there's a dependency in pyfiles.py
Mako
importlib-metadata;python_version<"3.8"
importlib-metadata;python_version<"3.9"
importlib-resources;python_version<"3.9"
sphinx_copybutton==0.5.1
5 changes: 5 additions & 0 deletions docs/build/unreleased/1359.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.. change::
:tags: installation, changed
:tickets: 1359

Alembic 1.13 now supports Python 3.8 and above.
3 changes: 1 addition & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ classifiers =
Operating System :: OS Independent
Programming Language :: Python
Programming Language :: Python :: 3
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Expand All @@ -38,7 +37,7 @@ project_urls =
packages = find_namespace:
include_package_data = true
zip_safe = false
python_requires = >=3.7
python_requires = >=3.8

install_requires =
SQLAlchemy>=1.3.0
Expand Down

0 comments on commit 885f29a

Please sign in to comment.