-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[fc] Repository: Products.Archetypes
Branch: refs/heads/master Date: 2018-10-04T13:43:48+02:00 Author: Manuel Reinhardt (reinhardt) <[email protected]> Commit: plone/Products.Archetypes@4220b87 Removed travis config. Jenkins is used instead. #116 Files changed: A news/116.feature D .travis.yml D travis.cfg Repository: Products.Archetypes Branch: refs/heads/master Date: 2018-10-06T11:54:00+02:00 Author: Maurits van Rees (mauritsvanrees) <[email protected]> Commit: plone/Products.Archetypes@63ae9d1 Merge pull request #117 from plone/116-remove-travis Removed travis config Files changed: A news/116.feature D .travis.yml D travis.cfg
- Loading branch information
1 parent
b656b44
commit 46ab8c9
Showing
1 changed file
with
19 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,36 @@ | ||
| Repository: plone.testing | ||
| Repository: Products.Archetypes | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2018-10-06T10:41:10+02:00 | ||
| Author: Joni Orponen (Rotonen) <joni.orponen@gmail.com> | ||
| Commit: https://github.com/plone/plone.testing/commit/ebb234715b6c6fe7d5f00d068ed4d0a4ddb1ee00 | ||
| Date: 2018-10-04T13:43:48+02:00 | ||
| Author: Manuel Reinhardt (reinhardt) <reinhardt@syslab.com> | ||
| Commit: https://github.com/plone/Products.Archetypes/commit/4220b872b08a5ab3b7303c20ab040af5d778ee48 | ||
|
|
||
| The z2 extra should explicitly depend on ZServer. | ||
| Removed travis config. Jenkins is used instead. #116 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M buildout.cfg | ||
| M setup.py | ||
| A news/116.feature | ||
| D .travis.yml | ||
| D travis.cfg | ||
|
|
||
| b"diff --git a/CHANGES.rst b/CHANGES.rst\nindex 0563702..7869ed7 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,8 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Explicitly depend on ZServer on the z2 extra.\n+ [Rotonen]\n \n \n 6.1.0 (2018-10-05)\ndiff --git a/buildout.cfg b/buildout.cfg\nindex 8e7eafb..b0cf46f 100644\n--- a/buildout.cfg\n+++ b/buildout.cfg\n@@ -10,6 +10,12 @@ plone.testing =\n # From 2018-10-02\n # Please remove this pinning after we get on top of the ZODB issues!\n ZODB = < 5.4.0\n+# From 2018-10-06\n+# Please remove this pinning once the Zope 4.0 stack allows for it!\n+ZServer = < 4.0b3\n+# From 2018-10-06\n+# Please remove this pinning once collective.xmltestreport cuts a release!\n+zope.testrunner = < 4.9.0\n \n [test]\n recipe = collective.xmltestreport\ndiff --git a/setup.py b/setup.py\nindex 836476f..801633a 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -87,6 +87,7 @@\n ],\n 'z2': [\n 'Zope',\n+ 'ZServer',\n 'zope.component',\n 'zope.testbrowser',\n 'zope.publisher',\n" | ||
| b"diff --git a/.travis.yml b/.travis.yml\ndeleted file mode 100644\nindex cfe1c892..00000000\n--- a/.travis.yml\n+++ /dev/null\n@@ -1,19 +0,0 @@\n-language: python\n-python: 2.7\n-sudo: false\n-cache:\n- pip: true\n- directories:\n- - $HOME/buildout-cache\n-before_install:\n- - mkdir -p $HOME/buildout-cache/{eggs,downloads}\n- - python -m pip install -U pip virtualenv\n- - python -m virtualenv .\n-# Keep in sync with buildout.cfg:\n- - bin/python bootstrap.py --setuptools-version=38.2.4 --buildout-version=2.11.3\n-install:\n- - bin/python -V\n- - bin/buildout -Nvt 5 -c travis.cfg annotate\n- - bin/buildout -Nvt 5 -c travis.cfg\n-script:\n- - bin/test -vc\ndiff --git a/news/116.feature b/news/116.feature\nnew file mode 100644\nindex 00000000..e0990c05\n--- /dev/null\n+++ b/news/116.feature\n@@ -0,0 +1 @@\n+Removed travis config. Jenkins is used instead.\ndiff --git a/travis.cfg b/travis.cfg\ndeleted file mode 100644\nindex 1603b236..00000000\n--- a/travis.cfg\n+++ /dev/null\n@@ -1,7 +0,0 @@\n-[buildout]\n-extends = buildout.cfg\n-\n-# caches, see also .travis.yaml\n-# one should not depend on '/home/travis' but it seems stable in containers.\n-eggs-directory = /home/travis/buildout-cache/eggs\n-download-cache = /home/travis/buildout-cache/downloads\n" | ||
|
|
||
| Repository: plone.testing | ||
| Repository: Products.Archetypes | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2018-10-06T11:49:15+02:00 | ||
| Author: Jens W. Klein (jensens) <[email protected]> | ||
| Commit: https://github.com/plone/plone.testing/commit/f20a9c737781b46e9dcb927fe130ff84c70bb6a0 | ||
| Date: 2018-10-06T11:54:00+02:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <[email protected]> | ||
| Commit: https://github.com/plone/Products.Archetypes/commit/63ae9d1c13586ef7a516777fda73215848386a28 | ||
|
|
||
| Merge pull request #57 from plone/roto-fix-z2-extra-zserver | ||
| Merge pull request #117 from plone/116-remove-travis | ||
|
|
||
| The z2 extra should explicitly depend on ZServer | ||
| Removed travis config | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M buildout.cfg | ||
| M setup.py | ||
| A news/116.feature | ||
| D .travis.yml | ||
| D travis.cfg | ||
|
|
||
| b"diff --git a/CHANGES.rst b/CHANGES.rst\nindex 0563702..7869ed7 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,8 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Explicitly depend on ZServer on the z2 extra.\n+ [Rotonen]\n \n \n 6.1.0 (2018-10-05)\ndiff --git a/buildout.cfg b/buildout.cfg\nindex 8e7eafb..b0cf46f 100644\n--- a/buildout.cfg\n+++ b/buildout.cfg\n@@ -10,6 +10,12 @@ plone.testing =\n # From 2018-10-02\n # Please remove this pinning after we get on top of the ZODB issues!\n ZODB = < 5.4.0\n+# From 2018-10-06\n+# Please remove this pinning once the Zope 4.0 stack allows for it!\n+ZServer = < 4.0b3\n+# From 2018-10-06\n+# Please remove this pinning once collective.xmltestreport cuts a release!\n+zope.testrunner = < 4.9.0\n \n [test]\n recipe = collective.xmltestreport\ndiff --git a/setup.py b/setup.py\nindex 836476f..801633a 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -87,6 +87,7 @@\n ],\n 'z2': [\n 'Zope',\n+ 'ZServer',\n 'zope.component',\n 'zope.testbrowser',\n 'zope.publisher',\n" | ||
| b"diff --git a/.travis.yml b/.travis.yml\ndeleted file mode 100644\nindex cfe1c892..00000000\n--- a/.travis.yml\n+++ /dev/null\n@@ -1,19 +0,0 @@\n-language: python\n-python: 2.7\n-sudo: false\n-cache:\n- pip: true\n- directories:\n- - $HOME/buildout-cache\n-before_install:\n- - mkdir -p $HOME/buildout-cache/{eggs,downloads}\n- - python -m pip install -U pip virtualenv\n- - python -m virtualenv .\n-# Keep in sync with buildout.cfg:\n- - bin/python bootstrap.py --setuptools-version=38.2.4 --buildout-version=2.11.3\n-install:\n- - bin/python -V\n- - bin/buildout -Nvt 5 -c travis.cfg annotate\n- - bin/buildout -Nvt 5 -c travis.cfg\n-script:\n- - bin/test -vc\ndiff --git a/news/116.feature b/news/116.feature\nnew file mode 100644\nindex 00000000..e0990c05\n--- /dev/null\n+++ b/news/116.feature\n@@ -0,0 +1 @@\n+Removed travis config. Jenkins is used instead.\ndiff --git a/travis.cfg b/travis.cfg\ndeleted file mode 100644\nindex 1603b236..00000000\n--- a/travis.cfg\n+++ /dev/null\n@@ -1,7 +0,0 @@\n-[buildout]\n-extends = buildout.cfg\n-\n-# caches, see also .travis.yaml\n-# one should not depend on '/home/travis' but it seems stable in containers.\n-eggs-directory = /home/travis/buildout-cache/eggs\n-download-cache = /home/travis/buildout-cache/downloads\n" | ||
|
|