Merge branch 'main' into pass-arg-type

Quantco · Dec 4, 2023 · f06b8b6 · f06b8b6
2 parents 65ac4e3 + c1fb063
commit f06b8b6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,14 +38,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/setup-micromamba@v1 
         with:
-          python-version: ${{ matrix.PYTHON_VERSION }}
-          miniforge-variant: Mambaforge
-          miniforge-version: 4.11.0-2
-          use-mamba: true
           environment-file: environment.yml
-          activate-environment: spox
+          create-args: >-
+            python=${{ matrix.PYTHON_VERSION }}
       - name: Run unit tests
         shell: bash -l {0}
         run: |
@@ -67,14 +64,11 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref }}
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: mamba-org/setup-micromamba@v1 
         with:
-          python-version: ${{ matrix.PYTHON_VERSION }}
-          miniforge-variant: Mambaforge
-          miniforge-version: 4.11.0-2
-          use-mamba: true
           environment-file: environment.yml
-          activate-environment: spox
+          create-args: >-
+            python=${{ matrix.PYTHON_VERSION }}
       - name: Run code generation
         shell: bash -l {0}
         run: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/Quantco/pre-commit-mirrors-black
-    rev: 23.10.1
+    rev: 23.11.0
     hooks:
       - id: black-conda
         args:
@@ -16,7 +16,7 @@ repos:
       - id: isort-conda
         additional_dependencies: [-c, conda-forge, toml=0.10.2]
   - repo: https://github.com/Quantco/pre-commit-mirrors-mypy
-    rev: "1.6.1"
+    rev: "1.7.1"
     hooks:
       - id: mypy-conda
         additional_dependencies: [-c, conda-forge, types-setuptools]
@@ -27,7 +27,7 @@ repos:
         args:
           - --py38
   - repo: https://github.com/Quantco/pre-commit-mirrors-prettier
-    rev: 3.0.3
+    rev: 3.1.0
     hooks:
       - id: prettier-conda
         files: "\\.md$"