- 10 Sep, 2015 1 commit
-
-
Kazuhiko Shiozaki authored
-
- 18 Aug, 2015 2 commits
-
-
Kazuhiko Shiozaki authored
-
Kirill Smelkov authored
Commit 57f3dd73 (Write .installed.cfg only once, in safe way and only if there's any change) changed the way how __buildout_installed__ is read and then written back on part upgrade. In particular, before it was always: on install: - get [] of installed parts from recipe.install() on update: - read __buildout_installed__ - split it by \n on write back for both: - join by \n - write to __buildout_installed__ but after that patch on-update stopped doing that split by \n and on writeback the code checks for installed_files to be string and does not split it if it is. Except the check does not work for unicode strings. Look e.g. what currently happens with fluentd: After first install it is __buildout_installed__ = !py!u'/srv/slapgrid/slappart6/srv/runner/software/73a7bf66fea06c703a70faaced67dabf/parts/fluentd\n/srv/slapgrid/slappart6/srv/runner/software/73a7bf66fea06c703a70faaced67dabf/bin/fluent-cat\n/srv/slapgrid/slappart6/srv/runner/software/73a7bf66fea06c703a70faaced67dabf/bin/fluent-gem\n/srv/slapgrid/slappart6/srv/runner/software/73a7bf66fea06c703a70faaced67dabf/bin/fluent-debug\n/srv/slapgrid/slappart6/srv/runner/software/73a7bf66fea06c703a70faaced67dabf/bin/fluentd\n/srv/slapgrid/slappart6/srv/runner/software/73a7bf66fea06c703a70faaced67dabf/bin/gem' but after update it becomes __buildout_installed__ = !py!u'/\ns\nr\nv\n/\ns\nl\na\np\ng\nr\ni\nd\n/\ns\nl\na\np\np\na\nr\nt\n6\n/\ns\nr\nv\n/\nr\nu\nn\nn\ne\nr\n/\ns\no\nf\nt\nw\na\nr\ne\n/\n7\n3\na\n7\nb\nf\n6\n6\nf\ne\na\n0\n6\nc\n7\n0\n3\na\n7\n0\nf\na\na\nc\ne\nd\n6\n7\nd\na\nb\nf\n/\np\na\nr\nt\ns\n/\nf\nl\nu\ne\nn\nt\nd\n\n\n/\ns\nr\nv\n/\ns\nl\na\np\ng\nr\ni\nd\n/\ns\nl\na\np\np\na\nr\nt\n6\n/\ns\nr\nv\n/\nr\nu\nn\nn\ne\nr\n/\ns\no\nf\nt\nw\na\nr\ne\n/\n7\n3\na\n7\nb\nf\n6\n6\nf\ne\na\n0\n6\nc\n7\n0\n3\na\n7\n0\nf\na\na\nc\ne\nd\n6\n7\nd\na\nb\nf\n/\nb\ni\nn\n/\nf\nl\nu\ne\nn\nt\n-\nc\na\nt\n\n\n/\ns\nr\nv\n/\ns\nl\na\np\ng\nr\ni\nd\n/\ns\nl\na\np\np\na\nr\nt\n6\n/\ns\nr\nv\n/\nr\nu\nn\nn\ne\nr\n/\ns\no\nf\nt\nw\na\nr\ne\n/\n7\n3\na\n7\nb\nf\n6\n6\nf\ne\na\n0\n6\nc\n7\n0\n3\na\n7\n0\nf\na\na\nc\ne\nd\n6\n7\nd\na\nb\nf\n/\nb\ni\nn\n/\nf\nl\nu\ne\nn\nt\n-\ng\ne\nm\n\n\n/\ns\nr\nv\n/\ns\nl\na\np\ng\nr\ni\nd\n/\ns\nl\na\np\np\na\nr\nt\n6\n/\ns\nr\nv\n/\nr\nu\nn\nn\ne\nr\n/\ns\no\nf\nt\nw\na\nr\ne\n/\n7\n3\na\n7\nb\nf\n6\n6\nf\ne\na\n0\n6\nc\n7\n0\n3\na\n7\n0\nf\na\na\nc\ne\nd\n6\n7\nd\na\nb\nf\n/\nb\ni\nn\n/\nf\nl\nu\ne\nn\nt\n-\nd\ne\nb\nu\ng\n\n\n/\ns\nr\nv\n/\ns\nl\na\np\ng\nr\ni\nd\n/\ns\nl\na\np\np\na\nr\nt\n6\n/\ns\nr\nv\n/\nr\nu\nn\nn\ne\nr\n/\ns\no\nf\nt\nw\na\nr\ne\n/\n7\n3\na\n7\nb\nf\n6\n6\nf\ne\na\n0\n6\nc\n7\n0\n3\na\n7\n0\nf\na\na\nc\ne\nd\n6\n7\nd\na\nb\nf\n/\nb\ni\nn\n/\nf\nl\nu\ne\nn\nt\nd\n\n\n/\ns\nr\nv\n/\ns\nl\na\np\ng\nr\ni\nd\n/\ns\nl\na\np\np\na\nr\nt\n6\n/\ns\nr\nv\n/\nr\nu\nn\nn\ne\nr\n/\ns\no\nf\nt\nw\na\nr\ne\n/\n7\n3\na\n7\nb\nf\n6\n6\nf\ne\na\n0\n6\nc\n7\n0\n3\na\n7\n0\nf\na\na\nc\ne\nd\n6\n7\nd\na\nb\nf\n/\nb\ni\nn\n/\ng\ne\nm' Correct the check to take unicode strings into account. /cc @jm /reviewed-by @kazuhiko
-
- 09 Jul, 2015 2 commits
-
-
Julien Muchembled authored
-
Julien Muchembled authored
Previous attempt to fix possible corruption was reverted because it had severe performance issues (both CPU & storage). Also, updating a part does not put it anymore at the end of the list of installed parts. It was breaking uninstall dependencies.
-
- 06 Jul, 2015 1 commit
-
-
Julien Muchembled authored
-
- 01 Jul, 2015 1 commit
-
-
Julien Muchembled authored
This reverts commit 54bbe6bf.
-
- 10 Jun, 2015 6 commits
-
-
Julien Muchembled authored
Conflicts: zc.recipe.egg_/setup.py zc.recipe.egg_/src/zc/recipe/egg/egg.py
-
Kazuhiko Shiozaki authored
-
Kazuhiko Shiozaki authored
-
Kirill Smelkov authored
Currently only zc.recipe.egg:custom supports setting environment variables, and zc.recipe.egg:develop does not. My motivation for allowing setting environment in :develop is wendelin.core https://lab.nexedi.cn/nexedi/slapos/blob/b5faab3b/component/wendelin.core/buildout.cfg There we have [wendelin.core] part which installs released egg from pypi, and [wendelin.core-dev] part which installs wendelin.core from its latest git version via zc.recipe.egg:develop . The problem is, wendelin.core for setup.py to work, needs git available, and with slapos we usually don't have git available on base system, so we build it by our own and do something like [wendelin.core-dev] recipe = zc.recipe.egg:develop environment = wendelin.core-dev-env [wendelin.core-dev-env] # wendelin.core-dev needs git to build PATH = ${git:location}/bin:%(PATH)s and the problem is environment does not currently work for zc.recipe.egg:develop, and thus git is not found -> build fails. ~~~~ In order to support environment in :develop, we just move environment setting/restoring bits from Custom to Base, and provide Base.install() which uses this bits. Custom & Develop .install() becomes ._install() which gets hooked into Base.install() . I've tested the patch only manually, because currently automated tests are broken in a lot of places for slapos.buildout and zc.recipe.egg . /cc @kazuhiko, @Tyagov
-
http://legacy.python.org/dev/peps/pep-0440/Kazuhiko Shiozaki authored
- Support on the fly patches in zc.recipe.egg by ``EGGNAME-patches``, ``EGGNAME-patch-options``, ``EGGNAME-patch-binary`` (or ``patch-binary``) and ``EGGNAME-patch-revision`` options. - Support on the fly patches in zc.recipe.egg:custom by ``patches``, ``patch-options``, ``patch-binary`` and ``patch-revision`` options. (options ``EGGNAME-*`` are also supported as well).
-
Kazuhiko Shiozaki authored
-
- 26 May, 2015 2 commits
-
-
Kazuhiko Shiozaki authored
Merge branch 'always_use_build'
-
Kazuhiko Shiozaki authored
-
- 25 May, 2015 2 commits
-
-
Kazuhiko Shiozaki authored
Merge branch 'include_postrelease_string_in_version'
-
Kazuhiko Shiozaki authored
-
- 19 Apr, 2015 2 commits
-
-
Kazuhiko Shiozaki authored
-
Kazuhiko Shiozaki authored
-
- 17 Apr, 2015 1 commit
-
-
Jérome Perrin authored
This reduces the risk of leaving a corrupted .installed.cfg
-
- 12 Jan, 2015 1 commit
-
-
Kazuhiko Shiozaki authored
Version string is now N.N.N.postN to follow http://legacy.python.org/dev/peps/pep-0440/ . (Ideally it should be N.N.N+SlapOSNNN, but version string containing '+' sign does now work with older setuptools, that can be still used at the very beginning of bootstrap process.)
-
- 13 Dec, 2014 1 commit
-
-
Kazuhiko Shiozaki authored
-
- 12 Dec, 2014 1 commit
-
-
Kazuhiko Shiozaki authored
-
- 22 Oct, 2014 1 commit
-
-
Kazuhiko Shiozaki authored
-
- 11 Sep, 2014 2 commits
-
-
Kazuhiko Shiozaki authored
-
Kazuhiko Shiozaki authored
-
- 09 Sep, 2014 2 commits
-
-
Kazuhiko Shiozaki authored
-
Kazuhiko Shiozaki authored
-
- 29 Aug, 2014 1 commit
-
-
Kazuhiko Shiozaki authored
-
- 27 Aug, 2014 1 commit
-
-
Kazuhiko Shiozaki authored
Conflicts: .gitignore setup.py src/zc/buildout/buildout.py src/zc/buildout/download.py src/zc/buildout/easy_install.py src/zc/buildout/testing.py src/zc/buildout/tests.py
-
- 25 Aug, 2014 2 commits
-
-
Kazuhiko Shiozaki authored
-
Kazuhiko Shiozaki authored
-
- 12 Aug, 2014 2 commits
-
-
Kazuhiko Shiozaki authored
-
Kazuhiko Shiozaki authored
Add referred parts' hash strings in __buildout_signature__, that invokes rebuild of a part when one of its (recursive) dependencies are modified. Also remove duplicates and sort entries in __buildout_signature__.
-
- 10 Jul, 2013 2 commits
-
-
Cédric Le Ninivin authored
-
Cédric Le Ninivin authored
-
- 11 Apr, 2013 1 commit
-
-
Cédric de Saint Martin authored
-
- 21 Feb, 2013 1 commit
-
-
Jim Fulton authored
-
- 20 Feb, 2013 1 commit
-
-
Jim Fulton authored
buildout-2-compatible recipes weren't expressed correctly, leading to unintendional use of zc.recipe.egg-2.0.0a3.
-
- 19 Jan, 2013 1 commit
-
-
Jim Fulton authored
-