Merge pull request #9 from bdowning/github-actions

GitHub actions

Author: bdowning

.bumpversion.cfg

@@ -1,5 +1,19 @@
 [bumpversion]
-current_version = 0.3.16
+current_version = 0.4.0-alpha-1
+parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>.*)-(?P<build>\d+))?
+serialize = 
+	{major}.{minor}.{patch}-{release}-{build}
+	{major}.{minor}.{patch}
 commit = True
 
 [bumpversion:file:pyproject.toml]
+
+[bumpversion:part:release]
+first_value = regular
+optional_value = regular
+values = 
+	alpha
+	beta
+	rc
+	test
+	regular

.circleci/config.yml

@@ -0,0 +1,21 @@
+name: publish
+
+on:
+  push:
+    tags:
+      - 'v**'
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    env:
+      POETRY_PYPI_TOKEN_PYPI: ${{ secrets.POETRY_PYPI_TOKEN_PYPI }}
+    steps:
+      - uses: actions/checkout@v4
+      - run: pipx install poetry
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+          cache: poetry
+      - run: poetry build
+      - run: poetry publish

.github/workflows/publish.yml

@@ -0,0 +1,43 @@
+name: test
+
+on:
+  push:
+    branches:
+      - '**'
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        python-version:
+          - '3.9'
+          - '3.10'
+          - '3.11'
+          - '3.12'
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:16
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_PASSWORD: password
+    env:
+      PGPORT: 5432
+    steps:
+      - uses: actions/checkout@v4
+      - run: pipx install poetry
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: poetry
+      - run: poetry install
+      - run: poetry run flake8 sql_athame tests
+      - run: poetry run mypy sql_athame/**.py tests/**.py
+        if: success() || failure()
+      - run: poetry run black --check sql_athame tests
+        if: success() || failure()
+      - run: poetry run isort --check-only sql_athame/**.py tests/**.py
+        if: success() || failure()
+      - run: poetry run pytest
+        if: success() || failure()

.github/workflows/test.yml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sql-athame"
-version = "0.3.16"
+version = "0.4.0-alpha-1"
 description = "Python tool for slicing and dicing SQL"
 authors = ["Brian Downing <bdowning@lavos.net>"]
 license = "MIT"
@@ -12,12 +12,12 @@ repository = "https://github.com/bdowning/sql-athame"
 asyncpg = ["asyncpg"]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.9"
 asyncpg = { version = "*", optional = true }
 typing-extensions = "*"
 
 [tool.poetry.dev-dependencies]
-black = {version = "*", allow-prereleases = true}
+black = "*"
 isort = "*"
 pytest = "*"
 mypy = "*"

poetry.lock

@@ -33,10 +33,14 @@ ignore_missing_imports = True
 
 [flake8]
 ignore =
-    E501,  # max line length
-    W503,  # line break before binary operator; fights with black
+    # max line length
+    E501,
+    # multiple statements on one line (def); fights with black
+    E704,
+    # line break before binary operator; fights with black
+    W503,
 
 [coverage:run]
 include =
-    sql_athame/**py
-    tests/**py
+    sql_athame/**/*.py
+    tests/**/*.py

pyproject.toml

@@ -106,14 +106,12 @@ def fill(self, **kwargs: Any) -> "Fragment":
     @overload
     def prep_query(
         self, allow_slots: Literal[True]
-    ) -> Tuple[str, List[Union[Placeholder, Slot]]]:
-        ...  # pragma: no cover
+    ) -> Tuple[str, List[Union[Placeholder, Slot]]]: ...  # pragma: no cover
 
     @overload
     def prep_query(
         self, allow_slots: Literal[False] = False
-    ) -> Tuple[str, List[Placeholder]]:
-        ...  # pragma: no cover
+    ) -> Tuple[str, List[Placeholder]]: ...  # pragma: no cover
 
     def prep_query(self, allow_slots: bool = False) -> Tuple[str, List[Any]]:
         parts: List[FlatPart] = []
@@ -228,38 +226,32 @@ def identifier(name: str, prefix: Optional[str] = None) -> Fragment:
             return lit(f"{quote_identifier(name)}")
 
     @overload
-    def all(self, parts: Iterable[Fragment]) -> Fragment:
-        ...  # pragma: no cover
+    def all(self, parts: Iterable[Fragment]) -> Fragment: ...  # pragma: no cover
 
     @overload
-    def all(self, *parts: Fragment) -> Fragment:
-        ...  # pragma: no cover
+    def all(self, *parts: Fragment) -> Fragment: ...  # pragma: no cover
 
     def all(self, *parts) -> Fragment:  # type: ignore
         if parts and not isinstance(parts[0], Fragment):
             parts = parts[0]
         return any_all(list(parts), "AND", "TRUE")
 
     @overload
-    def any(self, parts: Iterable[Fragment]) -> Fragment:
-        ...  # pragma: no cover
+    def any(self, parts: Iterable[Fragment]) -> Fragment: ...  # pragma: no cover
 
     @overload
-    def any(self, *parts: Fragment) -> Fragment:
-        ...  # pragma: no cover
+    def any(self, *parts: Fragment) -> Fragment: ...  # pragma: no cover
 
     def any(self, *parts) -> Fragment:  # type: ignore
         if parts and not isinstance(parts[0], Fragment):
             parts = parts[0]
         return any_all(list(parts), "OR", "FALSE")
 
     @overload
-    def list(self, parts: Iterable[Fragment]) -> Fragment:
-        ...  # pragma: no cover
+    def list(self, parts: Iterable[Fragment]) -> Fragment: ...  # pragma: no cover
 
     @overload
-    def list(self, *parts: Fragment) -> Fragment:
-        ...  # pragma: no cover
+    def list(self, *parts: Fragment) -> Fragment: ...  # pragma: no cover
 
     def list(self, *parts) -> Fragment:  # type: ignore
         if parts and not isinstance(parts[0], Fragment):