Skip to content

Commit

Permalink
Merge branch 'main' into try-libmamba-2a3
Browse files Browse the repository at this point in the history
  • Loading branch information
jaimergp authored Sep 3, 2024
2 parents 9397d7a + ee8d10b commit d31dad5
Show file tree
Hide file tree
Showing 7 changed files with 6,264 additions and 6,162 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/builds-review.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
fetch-depth: 0

- name: Create and upload review build
uses: conda/actions/canary-release@976289d0cfd85139701b26ddd133abdd025a7b5f # v24.5.0
uses: conda/actions/canary-release@15f883f14f4232f83658e3609c3316d58905138f # v24.8.0
with:
package-name: conda-libmamba-solver
subdir: ${{ matrix.subdir }}
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jobs:
- '.github/workflows/tests.yml'
- 'tests/**'
- 'dev/requirements.txt'
- 'pyproject.toml'
# /CONDA-LIBMAMBA-SOLVER CHANGE

# windows test suite
Expand Down Expand Up @@ -203,7 +204,7 @@ jobs:

- name: Upload Test Results
if: '!cancelled()'
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: test-results-${{ env.HASH }}
# CONDA-LIBMAMBA-SOLVER CHANGE: need to prepend conda/ to the paths
Expand Down Expand Up @@ -344,7 +345,7 @@ jobs:

- name: Upload Test Results
if: '!cancelled()'
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: test-results-${{ env.HASH }}
path: |
Expand Down Expand Up @@ -628,7 +629,7 @@ jobs:

- name: Upload Test Results
if: '!cancelled()'
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: test-results-${{ env.HASH }}
# CONDA-LIBMAMBA-SOLVER CHANGE: need to prepend conda/ to the paths
Expand All @@ -653,7 +654,7 @@ jobs:

- name: Upload Combined Test Results
# provides one downloadable archive of all matrix run test results for further analysis
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: test-results-${{ github.sha }}-all
path: test-results-*
Expand Down Expand Up @@ -725,7 +726,7 @@ jobs:

# Explicitly use Python 3.11 since each of the OSes has a different default Python
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: '3.11'

Expand All @@ -751,7 +752,7 @@ jobs:
Path(environ["GITHUB_ENV"]).write_text(f"ANACONDA_ORG_LABEL={label}")
- name: Create & Upload
uses: conda/actions/canary-release@v24.5.0
uses: conda/actions/canary-release@v24.8.0
env:
# Run conda-build in isolated activation to properly package conda
_CONDA_BUILD_ISOLATED_ACTIVATION: 1
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ repos:
# auto format Python codes within docstrings
- id: blacken-docs
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.5.7
rev: v0.6.3
hooks:
# lint & attempt to correct failures (e.g. pyupgrade)
- id: ruff
Expand Down
4,134 changes: 2,084 additions & 2,050 deletions durations/Linux.json

Large diffs are not rendered by default.

4,124 changes: 2,079 additions & 2,045 deletions durations/Windows.json

Large diffs are not rendered by default.

4,146 changes: 2,090 additions & 2,056 deletions durations/macOS.json

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@ exclude = '''
minversion = "6.0"
addopts = [
"--color=yes",
"--strict-markers",
"--xdoctest-modules",
"--xdoctest-style=google",
"--tb=native",
"--strict-markers"
]

markers = [
Expand Down

0 comments on commit d31dad5

Please sign in to comment.