Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pre-commit.ci] pre-commit autoupdate #3

Merged
merged 4 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/disclaimer.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Copyright (C) 2022 Anaconda, Inc
Copyright (C) 2012 Anaconda, Inc
Copyright (C) 2023 conda
SPDX-License-Identifier: BSD-3-Clause
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,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.2
hooks:
# lint & attempt to correct failures (e.g. pyupgrade)
- id: ruff
Expand All @@ -56,4 +56,4 @@ repos:
hooks:
- id: insert-license
files: \.py$
args: [--license-filepath, .github/disclaimer.txt, --no-extra-eol]
args: [--license-filepath, .github/disclaimer.txt, --no-extra-eol]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ instructions on how to install, use and make the most out the `classic` conda so
| --- | :-: |
| [`conda install defaults::conda-classic-solver`](https://anaconda.org/anaconda/conda-classic-solver) | [![Anaconda-Server Badge](https://anaconda.org/anaconda/conda-classic-solver/badges/version.svg)](https://anaconda.org/anaconda/conda-classic-solver) |
| [`conda install conda-forge::conda-classic-solver`](https://anaconda.org/conda-forge/conda-classic-solver) | [![Anaconda-Server Badge](https://anaconda.org/conda-forge/conda-classic-solver/badges/version.svg)](https://anaconda.org/conda-forge/conda-classic-solver) |
| [`conda install conda-canary/label/dev::conda-classic-solver`](https://anaconda.org/conda-canary/conda-classic-solver) | [![Anaconda-Server Badge](https://anaconda.org/conda-canary/conda-classic-solver/badges/version.svg)](https://anaconda.org/conda-canary/conda-classic-solver) |
| [`conda install conda-canary/label/dev::conda-classic-solver`](https://anaconda.org/conda-canary/conda-classic-solver) | [![Anaconda-Server Badge](https://anaconda.org/conda-canary/conda-classic-solver/badges/version.svg)](https://anaconda.org/conda-canary/conda-classic-solver) |
2 changes: 1 addition & 1 deletion conda_classic_solver/plugin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2022 Anaconda, Inc
# Copyright (C) 2012 Anaconda, Inc
# Copyright (C) 2023 conda
# SPDX-License-Identifier: BSD-3-Clause
"""
Expand Down
1 change: 1 addition & 0 deletions conda_classic_solver/solve.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ def solve_final_state(
force_remove = context.force_remove if force_remove is NULL else force_remove

log.debug(
# noqa
"solving prefix %s\n"
" specs_to_remove: %s\n"
" specs_to_add: %s\n"
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2022 Anaconda, Inc
# Copyright (C) 2012 Anaconda, Inc
# Copyright (C) 2023 conda
# SPDX-License-Identifier: BSD-3-Clause
# Configuration file for the Sphinx documentation builder.
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ markers = [
[tool.ruff]
exclude = ["tests/data/"]
target-version = "py38"
line-length = 99

[tool.ruff.lint]
# E, W = pycodestyle errors and warnings
Expand Down
8 changes: 7 additions & 1 deletion tests/test_logic.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
# Copyright (C) 2012 Anaconda, Inc
# Copyright (C) 2023 conda
# SPDX-License-Identifier: BSD-3-Clause
from itertools import chain, combinations, permutations, product

import pytest
from conda.testing.helpers import raises

from conda_classic_solver.logic import FALSE, TRUE, Clauses, minimal_unsatisfiable_subset
from conda_classic_solver.logic import (
FALSE,
TRUE,
Clauses,
minimal_unsatisfiable_subset,
)

# These routines implement logical tests with short-circuiting
# and propagation of unknown values:
Expand Down
3 changes: 2 additions & 1 deletion tests/test_placeholder.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Copyright (C) 2022 Anaconda, Inc
# Copyright (C) 2012 Anaconda, Inc
# Copyright (C) 2023 conda
# SPDX-License-Identifier: BSD-3-Clause


def test_import():
from conda_classic_solver import ClassicSolver # noqa
1 change: 1 addition & 0 deletions tests/test_solvers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (C) 2012 Anaconda, Inc
# Copyright (C) 2023 conda
# SPDX-License-Identifier: BSD-3-Clause
from __future__ import annotations

Expand Down
Loading