Update ruff to latest and add formatter (#174)

* WIP

* WIP

* fix lint and llm

* update changelog

* fix llm

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* WIP

* fix verbose

.github/workflows/install.yaml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        python_version: ["3.8", "3.11"]
+        python_version: ["3.8", "3.12"]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Set up python ${{ matrix.python_version }}

.github/workflows/lint_check.yaml

@@ -2,14 +2,14 @@ name: Lint Check
 on: [pull_request]
 jobs:
   lint_check:
-    name: 3.11 lint check
+    name: 3.12 lint check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up Python 3.11
+      - name: Set up Python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: '3.11'
+          python-version: '3.12'
       - name: Install package with dev deps
         run: |
           python -m pip install -e ".[dev]"

.github/workflows/test_without_dev_deps.yaml

@@ -11,14 +11,14 @@ on:
   workflow_dispatch:
 jobs:
   tests:
-    name: 3.11 test
+    name: 3.12 test
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up python 3.11
+      - name: Set up python 3.12
         uses: actions/setup-python@v4
         with:
-          python-version: 3.11
+          python-version: 3.12
           cache: 'pip'
           cache-dependency-path: "pyproject.toml"
       - name: Build trane and install latest requirements

.github/workflows/tests.yaml

@@ -15,11 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.8", "3.11"]
-        type-of-tests: ["unit", "integration"]
-        exclude:
-          - python-version: "3.8"
-            type-of-tests: "integration"
+        python-version: ["3.8", "3.12"]
+        type-of-tests: ["unit"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up python ${{ matrix.python-version }}
@@ -40,12 +37,11 @@ jobs:
         if: (steps.cache.outputs.cache-hit == 'true') && ( github.event.pull_request.title != 'Automated Latest Dependency Updates')
         run:  python -m pip install --no-dependencies .
       - name: Run unit tests
-        if: ${{ matrix.type-of-tests != 'integration' }}
         run:  |
           make clean
           make unit-tests
       - name: Upload code coverage report
-        if: ${{ matrix.type-of-tests == 'unit' && matrix.python-version == '3.11' }}
+        if: ${{ matrix.type-of-tests == 'unit' && matrix.python-version == '3.12' }}
         uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.pre-commit-config.yaml

@@ -17,18 +17,15 @@ repos:
     hooks:
       - id: add-trailing-comma
         name: Add trailing comma
-  - repo: https://github.com/python/black
-    rev: 23.10.1
-    hooks:
-      - id: black
-        additional_dependencies: [".[jupyter]"]
-        types_or: [python, jupyter]
-        args:
-          - --config=./pyproject.toml
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.1.4
+    rev: v0.1.8
     hooks:
       - id: ruff
+        types_or: [ python, pyi, jupyter ]
         args:
           - --fix
           - --config=./pyproject.toml
+      - id: ruff-format
+        types_or: [ python, pyi, jupyter ]
+        args:
+          - --config=./pyproject.toml

Makefile

@@ -6,15 +6,16 @@ clean:
 	find . -name '*~' -delete
 	find . -name '.coverage.*' -delete
 
+LINT_CONFIG = trane/ tests/ --config=./pyproject.toml
 .PHONY: lint
 lint:
-	black trane/ tests/ --check --config=./pyproject.toml
-	ruff trane/ tests/ --config=./pyproject.toml
+	ruff check $(LINT_CONFIG)
+	ruff format --check $(LINT_CONFIG)
 
 .PHONY: lint-fix
 lint-fix:
-	black trane/ tests/ --config=./pyproject.toml
-	ruff trane/ tests/ --fix --config=./pyproject.toml
+	ruff check --fix $(LINT_CONFIG)
+	ruff format $(LINT_CONFIG)
 
 .PHONY: installdeps-dev
 installdeps-dev:
@@ -38,11 +39,7 @@ tests:
 
 .PHONY: unit-tests
 unit-tests:
-	$(PYTEST) tests/ --ignore=tests/integration_tests $(COVERAGE)
-
-.PHONY: integration-tests
-integration-tests:
-	$(PYTEST) tests/integration_tests
+	$(PYTEST) tests/ $(COVERAGE)
 
 .PHONY: upgradepip
 upgradepip:

docs/changelog.md

@@ -2,6 +2,17 @@
 
 Changelog
 ---------
+v0.8.0 (December X, X)
+=========================
+* Enhancements
+    * Update LLM helper to support updated GPT-4 models [#174][#174]
+    * Update ruff to latest and remove black as a development dependency [#174][#174]
+    * Add Python 3.11 markers and CI testing [#174][#174]
+* Fixes
+    *
+
+    [#174]: <https://github.com/trane-dev/Trane/pull/174>
+
 v0.7.0 (October 21, 2023)
 =========================
 * Enhancements

pyproject.toml

@@ -15,6 +15,7 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Operating System :: Microsoft :: Windows",
     "Operating System :: POSIX",
     "Operating System :: Unix",
@@ -55,13 +56,12 @@ test = [
     "pytest-runner >= 2.11.1",
 ]
 dev = [
-    "ruff >= 0.1.0" ,
-    "black[jupyter] >= 22.12.0",
-    "pre-commit == 2.20.0",
-    "toml >= 0.10.2",
+    "ruff >= 0.1.8" ,
+    "pre-commit >= 3.6.0",
 ]
 llm = [
-    "openai >= 0.28.1",
+    "openai >= 1.3.7",
+    "anthropic >= 0.7.7",
     "tiktoken >= 0.5.1",
 ]
 
@@ -128,17 +128,10 @@ requires = [
 ]
 build-backend = "setuptools.build_meta"
 
-[tool.black]
-line-length = 88
-target-version = ["py311"]
-
 [tool.ruff]
 preview = true
 line-length = 88
 ignore = ["E501"]
-exclude = [
-    "Examples",
-]
 select = [
     # Pyflakes
     "F",
@@ -151,9 +144,15 @@ select = [
     "I001"
 ]
 src = ["trane"]
+target-version = "py312"
 
 [tool.ruff.isort]
 known-first-party = ["trane"]
 
 [tool.ruff.per-file-ignores]
 "__init__.py" = ["F401", "E402", "F403", "F405", "E501", "I001"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "space"
+preview = true