Mercurial > evolve
changeset 4879:77e8ca85d740
branching: merge with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 04 Oct 2019 14:16:52 -0400 |
| parents | 7787baa5a6ae (current diff) 095bab0d0cd7 (diff) |
| children | 38079b848657 |
| files | |
| diffstat | 4 files changed, 43 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.gitlab-ci.yml Fri Oct 04 14:16:52 2019 -0400 @@ -0,0 +1,12 @@ +flake8: + script: + - pip install --user flake8 + - hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' -X hgext3rd/evolve/thirdparty | xargs -0 ~/.local/bin/flake8 +tests: + script: + - echo $PWD + - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"` + - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/ + - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'` + - (cd tests; /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py -j 3) + - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`
--- a/README Sat Sep 28 13:15:02 2019 +0200 +++ b/README Fri Oct 04 14:16:52 2019 -0400 @@ -14,7 +14,7 @@ This extension: -* enables the “changeset evolution” feature of Mercurial core, +* enables the "changeset evolution" feature of Mercurial core, * provides a set of commands to mutate your history,
--- a/setup.py Sat Sep 28 13:15:02 2019 +0200 +++ b/setup.py Fri Oct 04 14:16:52 2019 -0400 @@ -13,7 +13,7 @@ def get_version(): '''Read version info from a file without importing it''' - return get_metadata()['__version__'] + return u'%s' % get_metadata()['__version__'] def min_hg_version(): '''Read version info from a file without importing it''' @@ -28,6 +28,9 @@ 'hgext3rd.evolve.thirdparty', 'hgext3rd.topic', ] +py_packagedir = { + 'hgext3rd': join(dirname(__file__), 'hgext3rd') +} py_versions = '>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, <4' @@ -44,10 +47,11 @@ maintainer_email='pierre-yves.david@ens-lyon.org', url='https://www.mercurial-scm.org/doc/evolution/', description='Flexible evolution of Mercurial history.', - long_description=open('README').read(), + long_description=open(join(dirname(__file__), 'README')).read(), keywords='hg mercurial', license='GPLv2+', py_modules=py_modules, packages=py_packages, + package_dir=py_packagedir, python_requires=py_versions )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-version-install.t Fri Oct 04 14:16:52 2019 -0400 @@ -0,0 +1,24 @@ + $ cat >> $HGRCPATH <<EOF + > [extensions] + > EOF + $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH + +Test outputting version number + + $ hg version -v + Mercurial Distributed SCM (version *) (glob) + (see https://mercurial-scm.org for more information) + + Copyright (C) 2005-* Matt Mackall and others (glob) + This is free software; see the source for copying conditions. There is NO + warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + Enabled extensions: + + evolve external * (glob) + +Test install +TODO: fix warning + $ "$PYTHON" "$TESTDIR/../setup.py" install --root "$TESTTMP/installtest" > /dev/null + */distutils/dist.py:*: UserWarning: Unknown distribution option: 'python_requires' (glob) + warnings.warn(msg)