Merge branch 'main' into jschladen/log-attach-warning

Netflix · Feb 13, 2025 · c181900 · c181900
2 parents a496fa3 + 84e971e
commit c181900
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       matrix:
         python-version: [ "3.9", "3.10", "3.11" ]
-        postgres-version: [12, 15]
+        postgres-version: [12, 15, 17]
         os: [ubuntu-20.04, ubuntu-22.04]
         include:
           - python-version: "3.9"
@@ -84,21 +84,20 @@ jobs:
           source ~/env/bin/activate
           bandit -r . -ll -ii -x lemur/tests/,docs
           xvfb-run make test-js
-  # todo: re-enable me once https://github.com/coverallsapp/github-action/issues/205 is resolved
-  #     - name: Coveralls GitHub Action
-  #       uses: coverallsapp/github-action@v2
-  #       with:
-  #         parallel: true
-  #         flag-name: Python ${{ matrix.python-version }} Postgres ${{ matrix.postgres-version }} OS ${{ matrix.os }}
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  # coveralls:
-  #     name: Indicate completion to coveralls.io
-  #     needs: build
-  #     if: ${{ always() }}
-  #     runs-on: ubuntu-latest
-  #     steps:
-  #     - name: Coveralls Finished
-  #       uses: coverallsapp/github-action@v2
-  #       with:
-  #         parallel-finished: true
+      - name: Coveralls GitHub Action
+        uses: coverallsapp/github-action@v2
+        with:
+          parallel: true
+          flag-name: Python ${{ matrix.python-version }} Postgres ${{ matrix.postgres-version }} OS ${{ matrix.os }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  coveralls:
+      name: Indicate completion to coveralls.io
+      needs: build
+      if: ${{ always() }}
+      runs-on: ubuntu-latest
+      steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@v2
+        with:
+          parallel-finished: true
diff --git a/Makefile b/Makefile
@@ -87,6 +87,7 @@ test-js:
 test-python:
 	@echo "--> Running Python tests"
 	coverage run --source lemur -m pytest
+	coverage xml
 	@echo ""
 
 lint: lint-python lint-js

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -146,7 +146,7 @@ configobj==5.0.9
     #   certbot
 coverage==7.6.11
     # via -r requirements-tests.txt
-cryptography==44.0.0
+cryptography==44.0.1
     # via
     #   -r requirements-tests.txt
     #   acme

diff --git a/requirements-docs.txt b/requirements-docs.txt
@@ -159,7 +159,7 @@ configobj==5.0.9
     #   certbot
 coverage==7.6.11
     # via -r requirements-tests.txt
-cryptography==44.0.0
+cryptography==44.0.1
     # via
     #   -r requirements-docs.in
     #   -r requirements-tests.txt

diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -136,7 +136,7 @@ configobj==5.0.9
     #   certbot
 coverage==7.6.11
     # via -r requirements-tests.in
-cryptography==44.0.0
+cryptography==44.0.1
     # via
     #   -r requirements.txt
     #   acme

diff --git a/requirements.txt b/requirements.txt
@@ -80,7 +80,7 @@ configargparse==1.7
     # via certbot
 configobj==5.0.9
     # via certbot
-cryptography==44.0.0
+cryptography==44.0.1
     # via
     #   -r requirements.in
     #   acme