Bring history and adjust paths and imports #2

jaimergp · 2024-08-26T08:56:33Z

Description

Bringing the whole solver classic history to this repo. This was done with these commands:

Create patch file (classic-solver.patch.zip) from the conda/conda repo:

git log --pretty=email --reverse --binary --full-index \
    --patch-with-stat --first-parent -m -- \
    conda/common/_logic.py \
    conda/common/logic.py \
    conda/core/solve.py \
    conda/resolve.py \
    tests/test_logic.py \
    tests/test_solvers.py \
    > classic-solver.patch

Commit patch to this repo:

git am --committer-date-is-author-date < ../conda/classic-solver.patch

Adjusted committer info:

git filter-branch --env-filter '
export GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"
export GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"
' --tag-name-filter cat -- --branches --tags main..HEAD

Move files from conda/* to conda_classic_solver/* and adjust imports.

Log the package name that has a bad package name to stderr

Solver 4.0 PR

Mgrant broken env

merge 3.x

Fix for removing packages from broken environments

Updates no longer upgrade past features

Fixes to remove functionality and general performance issues

Fix for pinned spec matching

Improving hints: consolidate according to common sub-dependencies

Solver tweaks: code reduction, minor performance tweaks

Fixed solver string format.

Fix `dependency_sort` issue in clone

Features need "None" SAT polarity so we can assert they are false

Fix for strange interaction between features and versions

Performance improvements for large numbers of builds

start conda.common refactor

Initial commit: improvements to update behavior

Revert "Merge pull request #2214 from conda/kalefranz/conda-common"

Reduce the amount of extraneous info in hints

Print progress to the terminal rather than stdout (formerly #2005)

Flake8 Style Fixes

Better handling of channel collisions

Remove dead code

Prevent version downgrades during removes

Further fixes to channel collisions

Fix misc.install_local_packages

…612) * Issue #12007: Change "failed" language to "unsuccessful attempt" * fix line length * fix line length, add news file --------- Co-authored-by: Travis Hathaway <travis.j.hathaway@gmail.com>

Co-authored-by: jaimergp <jaimergp@users.noreply.github.com> Co-authored-by: Jannis Leidel <jannis@leidel.info>

* Do not considering prefix data when pruning * Remove usage of `odict()` and `concatv()` * Add news file --------- Co-authored-by: Martin Prüsse <prusse.martin@gmail.com> Co-authored-by: Bianca Henderson <bhenderson@anaconda.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Ken Odegard <kodegard@anaconda.com>

* Postponed deprecations to 24.3.0 (see #12681): * loading subcommands from conda-* executables * conda.export.handle_proxy_407 * conda.export.memoized * Remove 23.9.0 deprecations --------- Co-authored-by: Jannis Leidel <jannis@leidel.info>

* Re-enable pyupgrade via ruff * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Fixes from ruff --fix --unsafe-fixes * Ignore input export * In Python 3, io.open is an alias for open * News --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Introduce new post-solve plugin hook. Rework signature-verification to use the new post-solve hook. Update signature-verification tests to be more comprehensive and properly test signature-verification code. --------- Co-authored-by: Sebastien Awwad <sebastien.awwad@gmail.com> Co-authored-by: jaimergp <jaimergp@users.noreply.github.com>

Co-authored-by: jaimergp <jaimergp@users.noreply.github.com> Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>

* Add `conda.testing.tmp_channel` pytest fixture and deprecating `conda.testing.integration.make_temp_channel` helper function. * Deprecate remaining helper functions that still rely on `conda.testing.integration.run_command`. * Postpone `conda.base.context.Context.conda_exe` deprecation to `conda 24.9`. * Postpone `conda.testing.integration.run_command` deprecation to `conda 25.3`. * Postpone loading subcommands from executables deprecation to `conda 25.3`. * Remove remaining deprecations slated for `conda 24.3`. --------- Co-authored-by: Jannis Leidel <jannis@leidel.info>

* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.2.2 → v0.3.2](astral-sh/ruff-pre-commit@v0.2.2...v0.3.2) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.3.7 → v0.4.2](astral-sh/ruff-pre-commit@v0.3.7...v0.4.2) * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Enable ruff --unsafe-fixes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Disable ruff --unsafe-fixes again * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Daniel Bast <2790401+dbast@users.noreply.github.com>

* [pre-commit.ci] pre-commit autoupdate updates: - [github.com/astral-sh/ruff-pre-commit: v0.4.4 → v0.4.7](astral-sh/ruff-pre-commit@v0.4.4...v0.4.7) - [github.com/python-jsonschema/check-jsonschema: 0.28.3 → 0.28.4](python-jsonschema/check-jsonschema@0.28.3...0.28.4) * Use `os.path` instead of `genericpath` --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Ken Odegard <kodegard@anaconda.com>

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

kalefranz and others added 30 commits February 19, 2016 17:43

Merge pull request #1816 from ericdill/log-bad-package-name

3648874

Log the package name that has a bad package name to stderr

Merge pull request #2130 from conda/mgrant-remove

0497658

Solver 4.0 PR

Logging additions to aid debugging

639bdda

Merge pull request #2145 from conda/mgrant-broken-env

d2c1faf

Mgrant broken env

Merge pull request #2146 from conda/kalefranz/merge-3.x

e97f807

merge 3.x

Merge pull request #2148 from conda/mgrant-rem-broken

c1526d4

Fix for removing packages from broken environments

cleanup

56ba490

Merge pull request #2156 from conda/mgrant-feature-fix

f94cbf7

Updates no longer upgrade past features

Merge pull request #2159 from conda/mgrant-remove-fix

8ca0a03

Fixes to remove functionality and general performance issues

Merge pull request #2165 from conda/mgrant-match-fix

55cca9d

Fix for pinned spec matching

Merge pull request #2166 from conda/mgrant-better-hints

b23aec5

Improving hints: consolidate according to common sub-dependencies

Merge pull request #2171 from conda/mgrant-solver-cleanup

4ded1a2

Solver tweaks: code reduction, minor performance tweaks

Merge pull request #2187 from pelson/fix_str_formatting

f554519

Fixed solver string format.

Merge pull request #2193 from conda/mgrant-fix-clone

658475b

Fix `dependency_sort` issue in clone

Merge pull request #2199 from conda/mgrant-feature-sat

6bd9250

Features need "None" SAT polarity so we can assert they are false

Merge pull request #2206 from conda/mgrant-feature-fix1

2db67de

Fix for strange interaction between features and versions

Merge pull request #2209 from conda/mgrant-performance

fce9c2c

Performance improvements for large numbers of builds

Merge pull request #2214 from conda/kalefranz/conda-common

3aa89b8

start conda.common refactor

Merge pull request #2191 from conda/mgrant-update-all

3fd6f5f

Initial commit: improvements to update behavior

Merge remote-tracking branch 'origin/4.0.x'

0211996

Merge pull request #2270 from conda/revert_2214

cf38c04

Revert "Merge pull request #2214 from conda/kalefranz/conda-common"

Merge remote-tracking branch 'origin/4.0.x' after 4.0.5 release

cff130c

Merge pull request #2261 from conda/mgrant/hint-simplify

1923234

Reduce the amount of extraneous info in hints

Merge pull request #2281 from conda/pr2005

b599374

Print progress to the terminal rather than stdout (formerly #2005)

Merge pull request #2311 from alanhdu/master

aadda3f

Flake8 Style Fixes

Merge pull request #2323 from conda/mgrant/url-keys

698fddc

Better handling of channel collisions

Merge pull request #2338 from alanhdu/deadcode

93aa731

Remove dead code

Merge pull request #2394 from conda/mgrant/simple-remove2

0385cfb

Prevent version downgrades during removes

Merge pull request #2369 from conda/mgrant/channelfix

c6edc3a

Further fixes to channel collisions

Merge pull request #2428 from conda/mgrant/local

5bfeee5

Fix misc.install_local_packages

THEdavehogue and others added 21 commits May 4, 2023 05:04

Issue #12007: Change "failed" language to "unsuccessful attempt" (#12…

3ca0eed

…612) * Issue #12007: Change "failed" language to "unsuccessful attempt" * fix line length * fix line length, add news file --------- Co-authored-by: Travis Hathaway <travis.j.hathaway@gmail.com>

Remove incomplete private envs code (#12761)

4b3ed57

Adding docstrings to all public modules (#12792)

3f5774b

Co-authored-by: jaimergp <jaimergp@users.noreply.github.com> Co-authored-by: Jannis Leidel <jannis@leidel.info>

Remove 23.9.0 deprecations (#12948)

80a70ae

* Postponed deprecations to 24.3.0 (see #12681): * loading subcommands from conda-* executables * conda.export.handle_proxy_407 * conda.export.memoized * Remove 23.9.0 deprecations --------- Co-authored-by: Jannis Leidel <jannis@leidel.info>

Inject new detailed verbosity level (#12985)

ccf08af

Convert all absolute imports to relative (#13281)

4af8064

Replace black with ruff-format (#13272)

a9337cc

Merge pull request #13286 from conda/forward-23.10.0

4a8b872

Create local track_features/features packages for testing (#13498)

24e7677

Co-authored-by: jaimergp <jaimergp@users.noreply.github.com> Co-authored-by: Bianca Henderson <bhenderson@anaconda.com>

Add ISC/TCH/T10/FA lints (#13587)

4f7b5a3

Devendor frozendict (#13766)

b4930b7

Stop using log.trace(...) (#13732)

2bc904c

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Replace logger.warn w/ logger.warning (#13963)

830e337

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Move files and adjust imports

57ee572

jaimergp force-pushed the bring-history branch from 375718b to 03b20c3 Compare August 26, 2024 09:00

jezdez approved these changes Aug 26, 2024

View reviewed changes

Adjust copyright

b1a825c

jaimergp force-pushed the bring-history branch 2 times, most recently from c87b3b3 to b1a825c Compare August 26, 2024 10:51

jaimergp closed this Aug 27, 2024

jaimergp reopened this Aug 27, 2024

jaimergp merged commit 9b25919 into main Aug 27, 2024
99 of 121 checks passed

jaimergp deleted the bring-history branch August 27, 2024 17:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bring history and adjust paths and imports #2

Bring history and adjust paths and imports #2

jaimergp commented Aug 26, 2024 •

edited

Loading

Bring history and adjust paths and imports #2

Bring history and adjust paths and imports #2

Conversation

jaimergp commented Aug 26, 2024 • edited Loading

Description

jaimergp commented Aug 26, 2024 •

edited

Loading