Merge branch 'main' into next-major

FullStackWithLawrence · Nov 28, 2023 · 19c833c · 19c833c
2 parents 83b402e + 4fbcba8
commit 19c833c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 129 deletions.
diff --git a/.github/actions/tests/pre-commit/action.yml b/.github/actions/tests/pre-commit/action.yml
diff --git a/.github/workflows/pullRequestController.yml b/.github/workflows/pullRequestController.yml
@@ -113,16 +113,3 @@ jobs:
         uses: ./.github/actions/tests/python
         with:
           python-version: "${{ env.python-version}}"
-
-  pre_commit_tests:
-    needs: check_for_pending_release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        id: checkout
-        uses: actions/checkout@v4
-
-      - name: Run pre-commit tests
-        uses: ./.github/actions/tests/pre-commit
-        with:
-          python-version: "${{ env.python-version}}"
diff --git a/.github/workflows/runTests.yml b/.github/workflows/runTests.yml
@@ -26,8 +26,3 @@ jobs:
           openai-api-key: "${{ secrets.OPENAI_API_KEY }}"
           pinecone-api-key: "${{ secrets.PINECONE_API_KEY }}"
           pinecone-environment: "${{ secrets.PINECONE_ENVIRONMENT }}"
-
-      - name: Run pre-commit tests
-        uses: ./.github/actions/tests/pre-commit
-        with:
-          python-version: "${{ env.python-version}}"
diff --git a/__version__.py b/__version__.py
@@ -1 +1,3 @@
-__version__ = '1.1.4'
+# -*- coding: utf-8 -*-
+__version__ = '1.1.5'
+
diff --git a/grader/__version__.py b/grader/__version__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
-__version__ = "1.1.4"
+__version__ = '1.1.5'