1. 02 May, 2024 16 commits
    • Kazuhiko Shiozaki's avatar
    • Kazuhiko Shiozaki's avatar
    • Kazuhiko Shiozaki's avatar
      [why?] Ignore empty value for 'download-cache' in 'buildout' section · d36a8bcc
      Kazuhiko Shiozaki authored
      Even though such configuration is wrong...
      d36a8bcc
    • Julien Muchembled's avatar
      [feat] Enable partial support for += / -= with <= · c8c7feed
      Julien Muchembled authored
      Before this, += and -= worked well when applied to keys defined in the
      current section or in a section of the same name inherited from a file
      extended by the current file, but not to keys inherited from another
      section using macro extension <=, because <= substitution happens later
      and all the += and -= are already resolved.
      
      e.g.:
      
      ```
      [macro]
      a = 1
      
      [part]
      <= macro
      a += 2
      ```
      
      was equivalent to
      
      ```
      [part]
      a = 1
      a = 2
      ```
      
      instead of
      
      ```
      [part]
      a = 1
      a += 2
      ```
      
      Now a partial and brittle support for this is enabled by postponing
      += and -= resolution until <= substitution happens when the current
      section contains a <= extension. But this is not guaranteed: if the
      current section is overloaded in another file extending the current
      one, then += and -= resolution will happend then, before <=.
      
      A consistent solution would be to unify the implementation of
      extends= and <= and update sections by taking both into account,
      instead of updating based only on extends and computing <= later,
      leading to inconsistencies. This could be achieved e.g. by computing
      section updates on demand during substitution.
      Co-authored-by: Xavier Thompson's avatarXavier Thompson <xavier.thompson@nexedi.com>
      c8c7feed
    • Julien Muchembled's avatar
      [fix] Fix +=/-= support for keys in the same file · 229acafa
      Julien Muchembled authored
      Before this, += and -= worked correctly when applied to a key defined
      in a file extended by the current file, but not when the key was in
      the same file.
      
      e.g.:
      
      ```
      [part]
      a = this case is
      ```
      
      ```
      [buildout]
      extends = a.cfg
      
      [part]
      a += ok
      b = this case is
      b += not-ok
      ```
      Co-authored-by: Xavier Thompson's avatarXavier Thompson <xavier.thompson@nexedi.com>
      229acafa
    • Xavier Thompson's avatar
      [test] Disable extends-cache.txt test · be32462a
      Xavier Thompson authored
      This test asserts buildout's behavior with regards to download options,
      and this was changed by the new algorithm for extends. Tests for the
      new behavior have not been written yet.
      be32462a
    • Xavier Thompson's avatar
      [feat] Reimplement the extends algorithm · cd5bd96b
      Xavier Thompson authored
      The new algorithm avoids fetching the same extended file more than once
      and correctly handles overriding values and += and -=:
      
      The new algorithm starts as if there was a buildout file containing
      
      ```
      [buildout]
      extends =
        user/defaults.cfg # if it exists
        buildout.cfg # if it exists
        command_line_extends.cfg # if passed on the command line
      ```
      
      The files are then fetched in depth-first-search postorder and fetching
      child nodes in the order given by the extends directive, ignoring files
      that have already been fetched.
      
      The buildout dicts are then collected in order, and this linearisation
      is then merged at the end, overriding the first configs collected with
      the later ones. The first dict in the linearisation is not from a file,
      but the dict of buildout's (hardcoded) defaults. This is equivalent to
      acting as though every file that does not extend anything extends these
      defaults.
      
      The first time a file must be downloaded from a url, the linearisation
      is merged with the configs already collected, and the resulting options
      are then used to determine the download options for this download, and
      every subsequent download.
      
      This is a break with buildout's current logic for download options.
      
      By analogy with classes in Python, we are computing a linearisation of
      the class hierarchy to determine the method resolution order (MRO).
      This algorithm is not the same as Python's MRO since Python 2.3 (C3).
      
      It could be good to switch to a C3 linearisation like Python.
      cd5bd96b
    • Xavier Thompson's avatar
      [opti] Unannotate sections in-place · 187b916d
      Xavier Thompson authored
      This avoids unecessary copies. This is a preparatory step to
      reimplementing the extends algorithm. It may be that this breaks
      the extends algorithm as it is currently implemented.
      187b916d
    • Xavier Thompson's avatar
      [opti] Update sections in-place · 158e54de
      Xavier Thompson authored
      This avoids unecessary deepcopies. This is a preparatory step to
      reimplementing the extends algorithm. It may be that this breaks
      the extends algorithm as it is currently implemented.
      158e54de
    • Xavier Thompson's avatar
      [opti] Remove redundant deepcopies · 1109475b
      Xavier Thompson authored
      1109475b
    • Julien Muchembled's avatar
      [feat] Omit Python library in script paths · f365475e
      Julien Muchembled authored
      This is useful when using OS Python & eggs.
      
      Useless for SlapOS.
      f365475e
    • Xavier Thompson's avatar
      bf0368fb
    • Xavier Thompson's avatar
      [doc] Show getting-started with modern python venv · 0210f0df
      Xavier Thompson authored
      Also show `pip install <url-for-tar.gz-of-master-branch-on-gitlab>`.
      0210f0df
    • Xavier Thompson's avatar
      [fix] Allow only installable DEVELOP_DIST in index · bb688a02
      Xavier Thompson authored
      The package index considers may yield develop dists found on its local
      search_path - sys.path by default - in addition to its index_url.
      
      This commit discards such dists when they do not contain a setup.py
      nor a pyproject.toml, as a good heuristic of whether they will be
      installable or not.
      bb688a02
    • Xavier Thompson's avatar
      [fix] Fix package index selection indexing · db11a44f
      Xavier Thompson authored
      Index constructed package indexes by all their parameters.
      db11a44f
    • Xavier Thompson's avatar
      [feat] Add buildout:extra-paths option · d24b1082
      Xavier Thompson authored
      This option determines what paths zc.buildout will scan for already
      installed distributions. It can be set to an empty value to enable
      isolation. The special values 'sys.path', 'legacy' and 'zc.buildout'
      expand to particular paths. The default is 'zc.buildout'.
      
      The 'sys.path' mode simply expands to the currrent sys.path.
      
      The 'legacy' mode reproduces the previous behavior of specifically
      scanning the paths of the current zc.buildout distribution and its
      dependencies using a weird ordering logic that bears no relation to the
      order they appear in sys.path - which can produce unexpected results as
      other distributions for zc.buildout, pip, wheel and setuptools may take
      precedence over the ones currently running.
      
      The 'zc.buildout' mode is similar to 'legacy' as it uses only the paths
      of the currently running zc.buildout and dependencies, but unlike
      'legacy' mode it respects the order in which these appear in sys.path,
      avoiding unexpected results.
      
      This mode is set to the default because it is closest to 'legacy' mode
      and because it has a nice property: running in succession
      
        `buildout buildout:extra-paths= bootstrap` (1)
        `bin/buildout` (2)
      
      will result in (1) installing zc.buildout and its dependencies in
      ./eggs in isolation from the environment, and (2) using only the
      paths of these in ./eggs, i.e. continuing to operate in isolation,
      even without setting extra-paths explictly.
      d24b1082
  2. 29 Apr, 2024 3 commits
    • Xavier Thompson's avatar
      [fix] Fix bootstrap working set order · 2f6e6f29
      Xavier Thompson authored
      In bootstrap we potentially copy eggs from the working set to ./eggs.
      We then reconstruct the same working set using the moved locations.
      
      This commits ensures we keep a correct working set order throughout
      and that we avoid activating unintended dists.
      2f6e6f29
    • Xavier Thompson's avatar
      [fix] Fix working set sorting · 65b4b94c
      Xavier Thompson authored
      If a dist in the computed working set is at a location shared with
      other dists - such as site-packages - then when generating scripts
      these other packages may overshadow the next items on the sys.path
      and result in importing a different version than the one installed
      and intended by buildout.
      
      To avert this, a sort of the working set was introduced at various
      points just before generating a script.
      
      However, that sort put the paths referenced from an `.egg-link` in
      ./develop-eggs first. This is truly problematic because dists from
      site-packages which are not eggs - e.g. dists installed with pip -
      can become referenced as `.egg-link` during buildout bootstrap and
      the sort then causes site-packages to be one of the first items in
      sys.path.
      
      In particular when running buildout bootstrap from a venv in which
      zc.buildout was installed by pip, if any one of zc.buildout or its
      dependencies from the venv meets the version requirements, then it
      can cause the generated bin/buildout to import the dists only from
      the venv's site-packages, even when some do not meet requirements.
      
      To fix this, the sort now puts the dists from `./eggs` first as we
      know their locations contain only a single dist, and then puts the
      dists from ./develop-eggs which have locations inside the buildout
      directory before the others.
      
      The previous sort was also activating all the dists from the paths
      of the already activated dists.
      
      Note that this also means that any working set must be manipulated
      with care in general to avoid activating unintended dists from the
      locations of the already activated dists.
      65b4b94c
    • Xavier Thompson's avatar
      [fix] Use only ws.find in install · 8a649631
      Xavier Thompson authored
      Replace `pkg_resources.Environment(ws.entries).best_match(req, ws)`
      with `ws.find(req)`.
      
      The first already starts by calling `ws.find(req)` to attempt to find
      an already activated dist in the working set, but if none is found it
      then proceeds to scan through the entries of the environment - i.e.
      the locations of the directly-requested distributions, `ws.entries` -
      to activate a dist at these locations if one matches.
      
      This is problematic when directly-requested distributions are found in
      a location shared by multiple dists, such as site-packages: this gives
      that location precedence over the normal order of locations scanned by
      easy_install, and can result in undesired versions being chosen over
      versions available in ./eggs or in ./develop-eggs. The random aspect
      of this is also problematic, as the order of paths considered will
      depend on the order of the directly-requested distributions and where
      they are found.
      8a649631
  3. 13 Mar, 2024 2 commits
    • Xavier Thompson's avatar
      [feat] Respect pinned versions in bootstrap · 0dcfd8c2
      Xavier Thompson authored
      If zc.buildout or its dependencies have pinned versions that do not
      match the currently running versions, they are now installed in the
      local eggs directory from scratch according to the pinned versions.
      
      In offline mode this merely ensures that versions that satisfy the
      requirements are already available. This is the case when the eggs
      are already installed, or when the running versions are a match to
      the pinned versions or the absence of a pinned version.
      
      If after this matching versions of zc.buildout and its dependencies
      are not located in the local eggs or develop-eggs directories, they
      are copied there as was already the case before.
      0dcfd8c2
    • Xavier Thompson's avatar
      [bug] Fix accidental changes to PYTHONPATH in os.environ · e521348b
      Xavier Thompson authored
      When generating an environment dict for subprocess calls to pip,
      os.environ was accidentally modified despite efforts to copy it
      and modify only the copy, as copy.copy(os.environ) is not enough.
      e521348b
  4. 08 Nov, 2022 2 commits
  5. 06 Nov, 2022 17 commits