Merge pull request #155 from olirice/or/modernize-tooling

Modernize Tooling: pyproject.toml + poetry

Author: olirice

.github/workflows/pre-commit_hooks.yaml

@@ -15,12 +15,15 @@ jobs:
       with:
         python-version: '3.10'
 
-    - name: install pre-commit
+    - name: Install Poetry
       run: |
-        python -m pip install --upgrade pip
-        pip install pre-commit
+        curl -sSL https://install.python-poetry.org | python3 -
+        export PATH="$HOME/.local/bin:$PATH"
 
+    - name: Install Dependencies
+      run: |
+        poetry install
 
-    - name: run pre-commit hooks
+    - name: Run Pre-commit Hooks
       run: |
-        pre-commit run --all-files
+        poetry run pre-commit run --all-files

.github/workflows/test.yml

@@ -7,9 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
         matrix:
-            python-version: ['3.8', '3.11']
-            postgres-version: ['13', '14', '15']
-            sqlalchemy-version: ['1.4', '2.0']
+            python-version: ['3.9', '3.13']
+            postgres-version: ['13', '17']
 
     services:
 
@@ -31,16 +30,18 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
 
-    - name: Install
+    - name: Install Poetry
       run: |
-        pip install --upgrade pip
-        pip install wheel
-        pip install -e ".[dev]"
-        pip install "sqlalchemy==${{ matrix.sqlalchemy-version }}"
+        curl -sSL https://install.python-poetry.org | python3 -
+        export PATH="$HOME/.local/bin:$PATH"
+
+    - name: Install Dependencies
+      run: |
+        poetry install
 
     - name: Test with Coverage
       run: |
-        pytest --cov=alembic_utils src/test --cov-report=xml
+        poetry run pytest --cov=alembic_utils src/test --cov-report=xml
 
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v1

.gitignore

@@ -9,6 +9,9 @@ __pycache__/
 # vim
 *.swp
 
+# mac
+.DS_Store
+
 # Distribution / packaging
 .Python
 build/
@@ -30,6 +33,9 @@ share/python-wheels/
 *.egg
 MANIFEST
 
+# poetry
+poetry.lock
+
 # PyInstaller
 #  Usually these files are written by a python script from a template
 #  before PyInstaller builds the exe, so as to inject date/other infos into it.

.isort.cfg

@@ -36,4 +36,4 @@ repos:
     hooks:
     - id: mypy
       files: src/
-      args: ["--config-file", "mypy.ini"]
+      args: ["--config-file=pyproject.toml"]

.pre-commit-config.yaml

@@ -1,3 +1,65 @@
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.poetry]
+name = "alembic_utils"
+version = "0.8.7"
+description = "A sqlalchemy/alembic extension for migrating procedures and views"
+authors = ["Oliver Rice <[email protected]>"]
+license = "MIT"
+readme = "README.md"
+packages = [{include = "alembic_utils", from = "src"}]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "License :: OSI Approved :: MIT License",
+    "Intended Audience :: Developers",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: SQL",
+]
+
+[tool.poetry.urls]
+"PyPI" = "https://pypi.org/project/alembic-utils/"
+
+[tool.poetry.dependencies]
+python = ">=3.9"
+alembic = ">=1.9"
+flupy = "*"
+parse = ">=1.8.4"
+sqlalchemy = ">=1.4"
+typing_extensions = "*"
+
+[tool.poetry.group.dev.dependencies]
+black = "*"
+pylint = "*"
+pre-commit = "*"
+mypy = "*"
+psycopg2-binary = "*"
+pytest = "*"
+pytest-cov = "*"
+mkdocs = "*"
+
+[tool.poetry.group.nvim.dependencies]
+neovim = "*"
+python-language-server = "*"
+
+[tool.poetry.group.docs.dependencies]
+mkdocs = "*"
+pygments = "*"
+pymdown-extensions = "*"
+mkautodoc = "*"
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.setuptools.package-data]
+"*" = ["py.typed"]
+
 [tool.black]
 line-length = 100
 exclude = '''
@@ -13,3 +75,17 @@ exclude = '''
   | dist
 )/
 '''
+
+[tool.isort]
+known_third_party = ["alembic", "flupy", "parse", "pytest", "setuptools", "sqlalchemy"]
+
+[tool.mypy]
+follow_imports = "skip"
+strict_optional = true
+warn_redundant_casts = true
+warn_unused_ignores = false
+disallow_any_generics = true
+check_untyped_defs = true
+no_implicit_reexport = true
+ignore_missing_imports = true
+# disallow_untyped_defs = true

mypy.ini

@@ -1 +0,0 @@
-__version__ = "0.8.6"