Merge pull request #685 from maresb/cleanup-vendoring

Cleanup vendoring
conda · Sep 8, 2024 · 4ab4241 · 4ab4241
2 parents 7892b81 + 4dbbb0e
commit 4ab4241
Show file tree

Hide file tree

Showing 5 changed files with 2,710 additions and 589 deletions.
diff --git a/.github/workflows/update-lockfile.yaml b/.github/workflows/update-lockfile.yaml
@@ -27,17 +27,10 @@ jobs:
  - name: Install conda-lock from branch
  run: pip install --editable .
 
- # We don't generate for windows because xattr does not exist for
- # windows and conda-lock does not yet support platform specifiers
- # Remove platform arguments when one of these two things changes
  - name: Run conda-lock to recreate lockfile from scratch
  run: |
  rm environments/conda-lock.yml
  conda-lock \
- --platform linux-64 \
- --platform osx-64 \
- --platform osx-arm64 \
- --platform linux-aarch64 \
  --file=environments/dev-environment.yaml \
  --file=pyproject.toml \
  --lockfile=environments/conda-lock.yml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -16,14 +16,14 @@ repos:
  exclude: ^conda_lock/_vendor/conda/_vendor/appdirs\.py$
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.6.1
+ rev: v0.6.4
  hooks:
  - id: ruff
  args: [--fix, --exit-non-zero-on-fix]
  - id: ruff-format
 
 - repo: https://github.com/pre-commit/mirrors-mypy
- rev: v1.11.1
+ rev: v1.11.2
  hooks:
  - id: mypy
  additional_dependencies:

diff --git a/conda_lock/_vendor/cleo/_utils.py b/conda_lock/_vendor/cleo/_utils.py