Skip to content

Commit

Permalink
Fix legacy Python versions.
Browse files Browse the repository at this point in the history
We use a version of `zc.buildout` which does not understand `python_requires`.
So we have to do it manually.

Fixes #69.
  • Loading branch information
Michael Howitz committed Jul 2, 2021
1 parent 2126f51 commit 1539a39
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ max_line_length = off
# 4 space indentation
indent_size = 4

[*.{yml,zpt,pt,dtml}]
[*.{yml,zpt,pt,dtml,zcml}]
# 2 space indentation
indent_size = 2

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ on:
jobs:
build:
strategy:
# We want do see all failures:
# We want to see all failures:
fail-fast: false
matrix:
os:
- ubuntu
config:
# [Python version, tox env]
- ["3.8", "lint"]
Expand All @@ -27,7 +29,7 @@ jobs:
- ["3.9", "py39"]
- ["3.8", "coverage"]

runs-on: ubuntu-latest
runs-on: ${{ matrix.os }}-latest
name: ${{ matrix.config[1] }}
steps:
- name: "Configure PostgreSQL"
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*.profraw
*.pyc
*.pyo
*.so
.coverage
.coverage.*
.eggs/
Expand Down
8 changes: 5 additions & 3 deletions .meta.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# https://github.com/zopefoundation/meta/tree/master/config/zope-product
[meta]
template = "zope-product"
commit-id = "9f90556c794c07fb953906696fc3037b2847239d"
commit-id = "7f4327fd1d2df77214735d6ed9a1d4687ff28f6f"

[python]
with-appveyor = false
with-pypy = false
with-legacy-python = true
with-docs = false
with-sphinx-doctests = false
with-windows = false
with-future-python = false

[coverage]
fail-under = 70
Expand All @@ -21,6 +21,8 @@ additional-envlist = [
"py{36,37,38,39}-sqlalchemy{14}",
]
testenv-deps = [
"py27: psycopg2 < 2.9",
"py35: psycopg2 < 2.9",
"sqlalchemy09: SQLAlchemy==0.9.*",
"sqlalchemy10: SQLAlchemy==1.0.*",
"sqlalchemy11: SQLAlchemy==1.1.*",
Expand Down
4 changes: 3 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ skip_install = true
deps =
setuptools < 52
zc.buildout
py27: psycopg2 < 2.9
py35: psycopg2 < 2.9
sqlalchemy09: SQLAlchemy==0.9.*
sqlalchemy10: SQLAlchemy==1.0.*
sqlalchemy11: SQLAlchemy==1.1.*
Expand Down Expand Up @@ -89,7 +91,7 @@ commands =
[coverage:run]
branch = True
plugins = coverage_python_version
source = src
source = zope.sqlalchemy

[coverage:report]
precision = 2
Expand Down

0 comments on commit 1539a39

Please sign in to comment.