diff --git a/.github/workflows/test_and_publish.yml b/.github/workflows/test_and_publish.yml index f6939ef8..71799232 100644 --- a/.github/workflows/test_and_publish.yml +++ b/.github/workflows/test_and_publish.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.7", "3.8", "3.9", "3.10", "pypy-3"] + python-version: ["3.7", "3.8", "3.9", "3.10", "pypy3.8"] # The type of runner that the job will run on runs-on: ubuntu-22.04 @@ -48,7 +48,7 @@ jobs: # Setup Python - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} architecture: x64 diff --git a/doc/index.rst b/doc/index.rst index 65495d02..d705f57e 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -6,11 +6,12 @@ GeoAlchemy 2 Documentation GeoAlchemy 2 provides extensions to `SQLAlchemy `_ for working with spatial databases. -GeoAlchemy 2 focuses on `PostGIS `_. PostGIS 1.5 and -PostGIS 2 are supported. +GeoAlchemy 2 focuses on `PostGIS `_. PostGIS 1.5, +PostGIS 2 and PostGIS 3 are supported. SpatiaLite is also supported, but using GeoAlchemy 2 with SpatiaLite requires some specific -configuration on the application side. GeoAlchemy 2 works with SpatiaLite 4.3.0 and higher. +configuration on the application side. GeoAlchemy 2 works with SpatiaLite 4.3.0 and higher +(except for alembic helpers that need SpatiaLite >= 5). GeoAlchemy 2 aims to be simpler than its predecessor, `GeoAlchemy `_. Simpler to use, and simpler @@ -22,8 +23,7 @@ The current version of this documentation applies to the version |version| of Ge Requirements ------------ -GeoAlchemy 2 requires SQLAlchemy 0.8. GeoAlchemy 2 does not work with -SQLAlchemy 0.7 and lower. +GeoAlchemy 2 requires SQLAlchemy 1.4. Installation ------------ diff --git a/setup.cfg b/setup.cfg index 53032c12..124c6577 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,17 +3,17 @@ universal = 1 [tox:tox] -envlist = py{37,38,39,310}-sqla{11, latest}, pypy3-sqla{11, latest}, lint, coverage +envlist = py{37,38,39,310}-sqla{14, latest}, pypy3-sqla{14, latest}, lint, coverage requires= setuptools>42 [gh-actions] python = - 3.7: py37-sqla{11, latest}, lint - 3.8: py38-sqla{11, latest} - 3.9: py39-sqla{11, latest} - 3.10: py310-sqla{11, latest} - pypy-3: pypy3-sqla{11, latest} + 3.7: py37-sqla{14, latest}, lint + 3.8: py38-sqla{14, latest} + 3.9: py39-sqla{14, latest} + 3.10: py310-sqla{14, latest} + pypy3.8: pypy3-sqla{14, latest} [testenv] passenv= @@ -26,7 +26,7 @@ setenv= pypy3: EXPECTED_COV = 90 deps= alembic - sqla11: SQLAlchemy==1.1.2 + sqla14: SQLAlchemy==1.4.* sqlalatest: SQLAlchemy !pypy3: psycopg2 pypy3: psycopg2cffi diff --git a/setup.py b/setup.py index 1bfd43d9..6e1f3bb6 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,7 @@ zip_safe=False, setup_requires=["setuptools_scm"], install_requires=[ - 'SQLAlchemy>=1.1', + 'SQLAlchemy>=1.4', 'packaging' ], entry_points="""