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

Globally manage InstallRequirement.source_dir #7696

Merged
merged 9 commits into from
Feb 6, 2020
Merged

Globally manage InstallRequirement.source_dir #7696

merged 9 commits into from
Feb 6, 2020

Commits on Feb 6, 2020

  1. Calculate autodelete_unpacked earlier in prepare_linked_requirement 

    We want to use this value to determine whether a globally-managed
source_dir should delegate choosing deletion to the global tempdir
manager, so it needs to be above our call to
InstallRequirement.ensure_has_source_dir.
    @chrahunt
    chrahunt committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    c7cb3cd View commit details
    Browse the repository at this point in the history

  2. Wrap InstallRequirement.ensure_build_location in TempDirectory 

    Since we explicitly disable deletion this is a no-op, but we'll
parameterize the deletion soon.
    @chrahunt
    chrahunt committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    470c399 View commit details
    Browse the repository at this point in the history

  3. Do not write delete marker file to track source_dir delete preference 

    Previously we were writing a delete marker file which is checked in
InstallRequirement.remove_temporary_source which is only invoked if the
user did not pass --no-clean (and a PreviousBuildDirError was not
raised). Since our TempDirectory machinery now respects these conditions
we can just wrap our source directory in that instead of using this
ad-hoc mechanism for tracking our delete preference.

This will let us clean up a lot of dead code that only existed for this
use case.
    @chrahunt
    chrahunt committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    8197a4b View commit details
    Browse the repository at this point in the history

  4. Do not remove source directory in cleanup_temporary_source 

    Since nothing in our code writes the delete marker file, this block will
never execute.
    @chrahunt
    chrahunt committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    e6cc9e9 View commit details
    Browse the repository at this point in the history

  5. Remove delete_marker_file writing in tests 

    Nothing checks for this file, so no need to write it.
    @chrahunt
    chrahunt committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    98cd193 View commit details
    Browse the repository at this point in the history

  6. Remove unused utils.marker_files

    @chrahunt
    chrahunt committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    efe663d View commit details
    Browse the repository at this point in the history

  7. Remove InstallRequirement.remove_temporary_source 

    Since all directories are now globally-managed, we don't need to be
concerned with resetting the member values.

This will also let us remove several responsibilities from
RequirementSet, which will make integrating the new resolver easier.
    @chrahunt
    chrahunt committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    5cca8f1 View commit details
    Browse the repository at this point in the history

  8. Remove no-op RequirementSet.cleanup_files

    @chrahunt
    chrahunt committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    4a93045 View commit details
    Browse the repository at this point in the history

  9. Remove unused RequirementSet.reqs_to_cleanup

    @chrahunt
    chrahunt committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    85ab574 View commit details
    Browse the repository at this point in the history