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.

Sign up for GitHub

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

Jump to bottom

Merge 23.7.x branch back into main #13094

Merged
merged 8 commits into from
Sep 12, 2023
Merged

Merge 23.7.x branch back into main #13094

merged 8 commits into from
Sep 12, 2023

Commits on Sep 11, 2023

  1. use scandir() in find_commands.py to avoid stat() calls (#13071)

    @dholth
    dholth committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    34c6746 View commit details
    Browse the repository at this point in the history

  2. 23.7.x find commands regression picked from main (#13082) 

    * Speed up find_commands() on WSL (#13035)

On WSL, the entire Windows PATH is inherited, and calling `isfile`
(specifically, `os.stat`) across the filesystem boundary is
extremely slow. Delaying the check until after pattern matching
speeds things up considerably.

---------

Co-authored-by: P. Talley <otaithleigh@users.noreply.github.com>
Co-authored-by: Ken Odegard <kodegard@anaconda.com>
    @dholth @otaithleigh @kenodegard
    3 people committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    e3fe940 View commit details
    Browse the repository at this point in the history

  3. Fix find_commands permission error (#13086)

    @kenodegard
    kenodegard committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    ec90105 View commit details
    Browse the repository at this point in the history

  4. Backport test fixes to 23.7.x (#13090) 

    Co-authored-by: Travis Hathaway <travis.j.hathaway@gmail.com>
Fix `test_s3_server` failure (#12986)
    @kenodegard
    kenodegard committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    bac23cf View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Fix key sorting for json.dumps in conda config (#13076, #13088) 

    Co-authored-by: Ken Odegard <kodegard@anaconda.com>
    @beeankha @kenodegard
    beeankha and kenodegard committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    13c8ae3 View commit details
    Browse the repository at this point in the history

  2. Catch NotADirectoryError (#13089)

    @kenodegard
    kenodegard committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    10d07de View commit details
    Browse the repository at this point in the history

  3. Release 23.7.4 (#13092)

    @beeankha
    beeankha committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    7aecb8d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into 23.7.x

    @beeankha
    beeankha committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    bf39e8d View commit details
    Browse the repository at this point in the history