Apply suggestions from code review

Author: nabobalis

.github/workflows/ci.yml

@@ -1,7 +1,4 @@
-<<<<<<<
-=======
 # Main CI Workflow
->>>>>>>
 name: CI
 
 on:
@@ -49,13 +46,8 @@ jobs:
       - run: python -m twine check dist/*
 
   test:
-<<<<<<<
-    needs: [core]
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@main
-=======
     needs: [core, sdist_verify]
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/tox.yml@v1
->>>>>>>
     with:
       submodules: false
       coverage: codecov
@@ -127,13 +119,8 @@ jobs:
         github.event_name == 'pull_request' &&
         contains(github.event.pull_request.labels.*.name, 'Run publish')
       )
-<<<<<<<
-    needs: [test]
-    uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@main
-=======
     needs: [test, docs]
     uses: OpenAstronomy/github-actions-workflows/.github/workflows/publish_pure_python.yml@v1
->>>>>>>
     with:
       python-version: "3.12"
       test_extras: 'dev'

.pre-commit-config.yaml

@@ -1,11 +1,7 @@
 repos:
     # This should be before any formatting hooks like isort
   - repo: https://github.com/astral-sh/ruff-pre-commit
-<<<<<<<
-    rev: "v0.7.2"
-=======
     rev: "v0.8.1"
->>>>>>>
     hooks:
       - id: ruff
         args: ["--fix"]