Skip to content

Commit b3622dc

Browse files
Merge branch 'main' into comprehensive-diff
2 parents 7c9b031 + 2b3fd44 commit b3622dc

File tree

7 files changed

+100
-78
lines changed

7 files changed

+100
-78
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
17+
python-version: ["3.9", "3.10", "3.11", "3.12"]
1818
steps:
1919
- uses: actions/[email protected]
20-
- uses: actions/setup-python@v5.3.0
20+
- uses: actions/setup-python@v5.4.0
2121
with:
2222
python-version: "${{ matrix.python-version }}"
2323
- run: |
2424
pip install -r requirements-poetry.txt
25-
poetry install --sync
25+
poetry sync
2626
poetry run poe linters
2727
poetry run poe test
2828
poetry build

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ jobs:
1212
contents: write
1313
steps:
1414
- uses: actions/[email protected]
15-
- uses: actions/setup-python@v5.3.0
15+
- uses: actions/setup-python@v5.4.0
1616
with:
1717
python-version: ">=3.12"
1818
- run: |
1919
pip install -r requirements-poetry.txt
2020
git tag $(poetry version --short)
2121
git push origin $(poetry version --short)
2222
poetry self add poetry-version-plugin
23-
poetry install --sync
23+
poetry sync
2424
poetry build
2525
- name: Publish package distributions to PyPI
2626
uses: pypa/gh-action-pypi-publish@release/v1

.mergify.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ queue_rules:
55
allow_inplace_checks: true
66
queue_conditions:
77
- and: &CheckRuns
8-
- check-success=Test with Python 3.8
98
- check-success=Test with Python 3.9
109
- check-success=Test with Python 3.10
1110
- check-success=Test with Python 3.11
@@ -31,9 +30,6 @@ queue_rules:
3130
batch_max_wait_time: 5min
3231
commit_message_template:
3332
queue_branch_merge_method: fast-forward
34-
disallow_checks_interruption_from_queues:
35-
- default
36-
3733
pull_request_rules:
3834
- name: automatic merge
3935
conditions:

poetry.lock

Lines changed: 82 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
[tool.poetry]
1+
[project]
22
name = "sql-compare"
33
version = "0.1.3"
44
description = "Compare SQL schemas"
5-
authors = ["Charly Laurent <[email protected]>"]
6-
maintainers = ["Mergify <[email protected]>"]
5+
authors = [{ name = "Charly Laurent", email = "[email protected]" }]
6+
maintainers = [{ name = "Mergify", email = "[email protected]" }]
77
readme = "README.md"
8-
license = "Apache-2.0"
9-
repository = "https://github.com/Mergifyio/sql-compare"
8+
license = { text = "Apache-2.0" }
109
keywords = ["sql", "database", "schema", "compare", "diff", "migration"]
1110
classifiers = [
1211
"Development Status :: 5 - Production/Stable",
@@ -17,7 +16,6 @@ classifiers = [
1716
"Programming Language :: Python",
1817
"Programming Language :: Python :: 3",
1918
"Programming Language :: Python :: 3 :: Only",
20-
"Programming Language :: Python :: 3.8",
2119
"Programming Language :: Python :: 3.9",
2220
"Programming Language :: Python :: 3.10",
2321
"Programming Language :: Python :: 3.11",
@@ -29,9 +27,14 @@ classifiers = [
2927
"Topic :: Software Development :: Testing",
3028
"Topic :: Software Development :: Testing :: Unit",
3129
]
30+
requires-python = ">=3.9"
31+
32+
[project.urls]
33+
repository = "https://github.com/Mergifyio/sql-compare"
34+
"Bug Tracker" = "https://github.com/Mergifyio/sql-compare/issues"
3235

3336
[tool.poetry.dependencies]
34-
python = "^3.8"
37+
python = "^3.9"
3538
sqlparse = ">=0.5.0"
3639

3740
[tool.poetry.group.dev.dependencies]
@@ -42,9 +45,6 @@ poethepoet = ">=0.26.1,<0.31.0"
4245
deptry = ">=0.16.1,<0.21.0"
4346
semgrep = "^1.75.0"
4447

45-
[tool.poetry.urls]
46-
"Bug Tracker" = "https://github.com/Mergifyio/sql-compare/issues"
47-
4848
[build-system]
4949
requires = ["poetry-core"]
5050
build-backend = "poetry.core.masonry.api"

requirements-poetry.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
poetry==1.8.5
1+
poetry==2.0.1

tools/poetry-install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
if [ "$CI" ]; then
55
export POETRY_VIRTUALENVS_OPTIONS_NO_PIP=true
66
export POETRY_VIRTUALENVS_OPTIONS_NO_SETUPTOOLS=true
7-
poetry install --sync --no-cache
7+
poetry sync --no-cache
88
else
9-
poetry install --sync
9+
poetry sync
1010
fi

0 commit comments

Comments
 (0)