Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v7
- name: Set up Python
uses: actions/setup-python@v1
uses: actions/setup-python@v6
with:
python-version: '3.9'
python-version: '3.10'
- name: Install dependencies
run: |
pip install poetry
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
fail-fast: false
matrix:
python-version:
- '3.14'
- '3.13'
- '3.12'
- '3.11'
- '3.10'
- '3.9'
- '3.8'
- '3.7'

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v7
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Add ODBC repo
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,23 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v7

- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v6
with:
python-version: "3.9"
python-version: "3.10"

- name: Install Poetry
run: |
curl -sSL https://install.python-poetry.org | python - -y --version 1.6.1

- name: Update PATH
run: echo "$HOME/.local/bin" >> $GITHUB_PATH
curl -sSL https://install.python-poetry.org | python - -y --version 2.4
echo "$HOME/.local/bin" >> $GITHUB_PATH

- name: Build project for distribution
run: poetry build

- name: Create Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v3
with:
files: "dist/*"
generate_release_notes: true
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ interface to Db2 for [IBM i](https://en.wikipedia.org/wiki/IBM_i).

### Python

Python 3.7 - 3.12+ are supported.
Python 3.10+ is supported.

### IBM i Access ODBC Driver

Expand Down
89 changes: 50 additions & 39 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,66 @@
[tool.poetry]
[project]
name = "sqlalchemy-ibmi"
version = "0.9.4-dev"
description = "SQLAlchemy support for Db2 on IBM i"
readme = "README.md"
authors = [
"Naveen Ram <naveen.ram@ibm.com>",
"Kevin Adler <kadler@us.ibm.com>"
]
license = "Apache-2.0"
keywords = ["sqlalchemy", "database", "ibm", "ibmi", "db2"]
dynamic = ["classifiers"]
authors = [
{name = "Korinne Adler", email = "kadler@us.ibm.com"},
{name = "Naveen Ram", email = "naveen.ram@ibm.com"}
]
requires-python = ">=3.10"
dependencies = [
"sqlalchemy (>=1.4.0,<3.0)",
"pyodbc (>=5.0); python_version>='3.13'",
"pyodbc (>=4.0); python_version<'3.13'",
]

[dependency-groups]
test = [
"pytest >=7.2.1; python_version>='3.11'",
"pytest >=6.2.5; python_version~='3.10'",
]
lint = [
"flake8",
"black ~=22.8.0",
]
dev = [
{ include-group = "test" },
{ include-group = "lint" },
"bumpversion ~=0.5.0",
]
docs = [
"sphinx >1.0.0",
"sphinx-rtd-theme >0.4.0",
]

[project.urls]
Homepage = "https://github.com/IBM/sqlalchemy-ibmi"
Repository = "https://github.com/IBM/sqlalchemy-ibmi"
Documentation = "https://sqlalchemy-ibmi.readthedocs.io"

[project.entry-points."sqlalchemy.dialects"]
ibmi = "sqlalchemy_ibmi.base:IBMiDb2Dialect"
"ibmi.pyodbc" = "sqlalchemy_ibmi.base:IBMiDb2Dialect"

[build-system]
requires = ["poetry-core (>=2.0.0,<3.0.0)"]
build-backend = "poetry.core.masonry.api"

[tool.poetry]
classifiers =[
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"Operating System :: OS Independent",
"Topic :: Database :: Front-Ends",
]

packages = [
{include = "sqlalchemy_ibmi"}
]

include = [
{ path = "test/*", format = "sdist" },
{ path = "contributing/*", format = "sdist" },
Expand All @@ -27,40 +70,8 @@ include = [
{ path = "LICENSE", format = "sdist" },
]

requires-poetry = ">=2.0.0,<3.0.0"

[tool.black]
line-length = 88
required-version = 22
target-version = [
'py37',
'py38',
'py39',
'py310',
'py311',
'py312',
]

[tool.poetry.plugins."sqlalchemy.dialects"]
ibmi = "sqlalchemy_ibmi.base:IBMiDb2Dialect"
"ibmi.pyodbc" = "sqlalchemy_ibmi.base:IBMiDb2Dialect"

[tool.poetry.dependencies]
python = ">=3.7,<3.13"
sqlalchemy = ">=1.4.0, <3.0"
pyodbc = ">=4.0"

[tool.poetry.dev-dependencies]
pytest = [
{ version = ">=7.2.1", python = ">=3.11" },
{ version = ">=6.2.5", python = ">=3.10, <3.11" },
{ version = "<5.4", python = "<3.10" },
]
flake8 = "^3.7.9"
bumpversion = "^0.5.0"
sphinx = ">1.0.0"
sphinx-rtd-theme = ">0.4.0"
black = "^22.8.0"

[build-system]
requires = ["poetry-core"]
build-backend = "poetry.core.masonry.api"

Loading