diff --git a/.github/disclaimer.txt b/.github/disclaimer.txt index aa3ca3d..f45af93 100644 --- a/.github/disclaimer.txt +++ b/.github/disclaimer.txt @@ -1,3 +1,3 @@ -Copyright (C) 2022 Anaconda, Inc +Copyright (C) 2012 Anaconda, Inc Copyright (C) 2023 conda SPDX-License-Identifier: BSD-3-Clause diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index a1e75a6..1a98119 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -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 @@ -56,4 +56,4 @@ repos: hooks: - id: insert-license files: \.py$ - args: [--license-filepath, .github/disclaimer.txt, --no-extra-eol] \ No newline at end of file + args: [--license-filepath, .github/disclaimer.txt, --no-extra-eol] diff --git a/README.md b/README.md index 130e871..69fdbf3 100644 --- a/README.md +++ b/README.md @@ -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) | \ No newline at end of file +| [`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) | diff --git a/conda_classic_solver/plugin.py b/conda_classic_solver/plugin.py index e0947ba..84c4b0b 100644 --- a/conda_classic_solver/plugin.py +++ b/conda_classic_solver/plugin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Anaconda, Inc +# Copyright (C) 2012 Anaconda, Inc # Copyright (C) 2023 conda # SPDX-License-Identifier: BSD-3-Clause """ diff --git a/conda_classic_solver/solve.py b/conda_classic_solver/solve.py index 2ce3737..6688ebe 100644 --- a/conda_classic_solver/solve.py +++ b/conda_classic_solver/solve.py @@ -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" diff --git a/docs/conf.py b/docs/conf.py index 82e88bd..b633308 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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. diff --git a/pyproject.toml b/pyproject.toml index f72c1dd..a21d524 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 diff --git a/tests/test_logic.py b/tests/test_logic.py index 85d8f08..42ee203 100644 --- a/tests/test_logic.py +++ b/tests/test_logic.py @@ -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: diff --git a/tests/test_placeholder.py b/tests/test_placeholder.py index 498b664..9ad56b1 100644 --- a/tests/test_placeholder.py +++ b/tests/test_placeholder.py @@ -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 diff --git a/tests/test_solvers.py b/tests/test_solvers.py index bbe6e58..cb5638f 100644 --- a/tests/test_solvers.py +++ b/tests/test_solvers.py @@ -1,4 +1,5 @@ # Copyright (C) 2012 Anaconda, Inc +# Copyright (C) 2023 conda # SPDX-License-Identifier: BSD-3-Clause from __future__ import annotations