Merge pull request #194 from benjeffery/fix-codecov

Fix codecov and other CI issues

.circleci/config.yml

@@ -1,4 +1,8 @@
-version: 2
+version: 2.1
+
+orbs:
+  codecov: codecov/[email protected]
+
 jobs:
   build:
     docker:
@@ -58,7 +62,10 @@ jobs:
           command: |
             cd python
             python3 -m pytest --cov=kastore  --cov-report=xml --cov-branch tests
-            python3 -m codecov -F python
+
+      - codecov/upload:
+          flags: python
+          token: CODECOV_TOKEN
 
       - run:
           name: Build Python package
@@ -92,7 +99,10 @@ jobs:
               ./build-gcc/malloc_tests@exe/kastore.c.gcno \
               ./build-gcc/io_tests@exe/kastore.c.gcno \
               ./build-gcc/kastore@sha/kastore.c.gcno
-            codecov -X gcov -F C
+
+      - codecov/upload:
+          flags: C
+          token: CODECOV_TOKEN
 
       - run:
           name: Install shared library

.github/workflows/tests.yml

@@ -8,20 +8,18 @@ on:
 jobs:
   pre-commit:
     name: Lint
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     steps:
       - name: Cancel Previous Runs
         uses: styfle/[email protected]
         with:
           access_token: ${{ github.token }}
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
       - name: install clang-format
         run: |
-          sudo apt-get remove -y clang-6.0 libclang-common-6.0-dev libclang1-6.0 libllvm6.0
-          sudo apt-get autoremove
-          sudo apt-get install clang-format clang-format-6.0
-      - uses: pre-commit/[email protected]
+          pip install clang-format==6.0.1
+      - uses: pre-commit/[email protected]
 
 
   test:

.mergify.yml

@@ -32,7 +32,6 @@ pull_request_rules:
       queue:
         name: default
         method: rebase
-        rebase_fallback: none
         update_method: rebase
 
   - name: Remove label after merge

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: check-merge-conflict
       - id: debug-statements
@@ -13,31 +13,31 @@ repos:
     - id: clang-format
       verbose: true
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v3.3.0
+    rev: v3.9.0
     hooks:
       - id: reorder-python-imports
         args: [--application-directories=python,
                --unclassifiable-application-module=_kastore]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [--py3-plus, --py37-plus]
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 23.3.0
     hooks:
       - id: black
         language_version: python3
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/pycqa/flake8
+    rev: 6.0.0
     hooks:
       - id: flake8
         args: [--config=python/.flake8]
         additional_dependencies: ["flake8-bugbear==20.1.4", "flake8-builtins==1.5.2"]
   - repo: https://github.com/asottile/blacken-docs
-    rev: v1.12.1
+    rev: 1.13.0
     hooks:
       - id: blacken-docs
-        additional_dependencies: [black==20.8.b1]
+        additional_dependencies: [black==23.3.0]
         language_version: python3
 

python/kastore/store.py

@@ -255,7 +255,6 @@ class Store(Mapping):
     """
 
     def __init__(self, file, read_all=False, key_encoding="utf8"):
-
         # Get ourselves a local version of the file. The semantics here are complex
         # because need to support a range of inputs and the free behaviour is
         # slightly different on each.

python/requirements/development.txt

@@ -1,5 +1,4 @@
 attrs
-codecov
 coverage
 flake8
 hypothesis