-
-
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: plone.staticresources
Branch: refs/heads/master Date: 2019-06-28T19:38:04+02:00 Author: Johannes Raggam (thet) <thetetet@gmail.com> Commit: plone/plone.staticresources@414edc3 add missing information about an upgrade step Files changed: M README.rst Repository: plone.staticresources Branch: refs/heads/master Date: 2019-07-06T17:08:43+02:00 Author: Johannes Raggam (thet) <thetetet@gmail.com> Commit: plone/plone.staticresources@cfa2ee6 Merge pull request #33 from plone/thet-docs add missing information about an upgrade step Files changed: M README.rst
- Loading branch information
Showing
1 changed file
with
15 additions
and
58 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,75 +1,32 @@ | ||
| Repository: plone.app.multilingual | ||
| Repository: plone.staticresources | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2019-07-05T11:04:03+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/plone.app.multilingual/commit/c6bb364804983027a4fb33d3cd8f3e5c7f12e58c | ||
| Date: 2019-06-28T19:38:04+02:00 | ||
| Author: Johannes Raggam (thet) <thetetet@gmail.com> | ||
| Commit: https://github.com/plone/plone.staticresources/commit/414edc308d444f2839ad1c91d0ffc5265c7fdeac | ||
|
|
||
| cleanup: rm traces to plone < 5.2 | ||
| add missing information about an upgrade step | ||
|
|
||
| Files changed: | ||
| M setup.py | ||
| M README.rst | ||
|
|
||
| b"diff --git a/setup.py b/setup.py\nindex 54563329..39ed5c18 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -38,28 +38,17 @@\n include_package_data=True,\n zip_safe=False,\n install_requires=[\n- 'Products.CMFPlone>=5.0b1',\n- 'Products.GenericSetup>=1.8.2',\n- # we want p.a.layout >= 2.5.22 on 2.5.x branch OR >= 2.6.3\n- 'plone.app.layout>=2.5.22,!=2.6.0,!=2.6.1,!=2.6.2',\n- 'plone.app.registry',\n- 'plone.app.z3cform',\n- 'plone.behavior',\n- 'plone.dexterity',\n+ 'Products.CMFPlone>=5.2rc4',\n 'setuptools',\n 'six',\n- 'z3c.relationfield',\n- 'zope.publisher',\n ],\n extras_require={\n 'archetypes': [\n 'archetypes.multilingual',\n ],\n 'test': [\n- 'plone.app.testing[robot]>=4.2.2',\n+ 'plone.app.testing[robot]',\n 'plone.app.robotframework',\n- 'plone.app.contenttypes',\n- 'archetypes.multilingual',\n 'decorator', # BBB\n ],\n },\n" | ||
| b'diff --git a/README.rst b/README.rst\nindex 2a5e9fc..5d08d05 100644\n--- a/README.rst\n+++ b/README.rst\n@@ -33,7 +33,9 @@ How to upgrade the resources in this package\n \n 4. Increase the ``last_compilation`` date in ``src/plone/staticresources/profiles/default/registry/bundles.xml``.\n \n-5. Submit a Pull Request and run the tests on Jenkins.\n+5. Create an upgrade step for ``plone.app.upgrade``.\n+\n+6. Submit a Pull Request and run the tests on Jenkins.\n \n \n What has changed\n' | ||
|
|
||
| Repository: plone.app.multilingual | ||
| Repository: plone.staticresources | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2019-07-05T11:04:26+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/plone.app.multilingual/commit/ee28f060a7ed288bc7930646ade322ade820994d | ||
| Date: 2019-07-06T17:08:43+02:00 | ||
| Author: Johannes Raggam (thet) <thetetet@gmail.com> | ||
| Commit: https://github.com/plone/plone.staticresources/commit/cfa2ee677c692ce9423ff12885c5fbc614c353fc | ||
|
|
||
| remove unused and broken configurations | ||
| Merge pull request #33 from plone/thet-docs | ||
|
|
||
| Files changed: | ||
| M .gitignore | ||
| D buildout.cfg | ||
| D jenkins.cfg | ||
| D test-plone-5.0.x.cfg | ||
| D test-plone-5.1.x.cfg | ||
| D test-plone-5.x.cfg | ||
|
|
||
| b"diff --git a/.gitignore b/.gitignore\nindex 5894cbb6..3a725158 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -31,9 +31,6 @@ MKcodeintel\n # Mac\n .DS_Store\n \n-# Local development\n-local.cfg\n-\n # Emacs\n .emacs.desktop*\n \ndiff --git a/buildout.cfg b/buildout.cfg\ndeleted file mode 100644\nindex d0f1508a..00000000\n--- a/buildout.cfg\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-[buildout]\n-extends =\n- test-plone-5.1.x.cfg\ndiff --git a/jenkins.cfg b/jenkins.cfg\ndeleted file mode 100644\nindex 3c2ccdc5..00000000\n--- a/jenkins.cfg\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-[buildout]\n-extends =\n- buildout.cfg\n- https://raw.github.com/plone/buildout.jenkins/master/jenkins.cfg\n- https://raw.github.com/plone/buildout.jenkins/master/jenkins-code-analysis.cfg\n-jenkins-test-eggs =\n- plone.app.multilingual[test]\n- archetypes.multilingual[test]\n-jenkins-test-directories =\n- src/plone/app/multilingual\n- extras/archetypes.multilingual/src/archetypes/multilingual\n-\ndiff --git a/test-plone-5.0.x.cfg b/test-plone-5.0.x.cfg\ndeleted file mode 100644\nindex 139db4c2..00000000\n--- a/test-plone-5.0.x.cfg\n+++ /dev/null\n@@ -1,11 +0,0 @@\n-[buildout]\n-extends =\n- https://raw.github.com/collective/buildout.plonetest/master/test-5.0.x.cfg\n- test-plone-5.x.cfg\n-\n-plone-series = 5.0\n-\n-[versions]\n-# Plone 5.0 needs a plone.app.layout release from the 2.5.x series\n-plone.app.layout = 2.5.22\n-coverage = >=4.2\n\\ No newline at end of file\ndiff --git a/test-plone-5.1.x.cfg b/test-plone-5.1.x.cfg\ndeleted file mode 100644\nindex 8258d2ba..00000000\n--- a/test-plone-5.1.x.cfg\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-[buildout]\n-extends =\n- https://raw.github.com/collective/buildout.plonetest/master/test-5.1.x.cfg\n- test-plone-5.x.cfg\n-\n-plone-series = 5.1\n-\n-[versions]\n-# Plone 5.1 needs a plone.app.layout release from the 2.6.x series\n-plone.app.layout = 2.6.3\n-setuptools = 34.3.0\n-zc.buildout = 2.8.0\ndiff --git a/test-plone-5.x.cfg b/test-plone-5.x.cfg\ndeleted file mode 100644\nindex 686e2876..00000000\n--- a/test-plone-5.x.cfg\n+++ /dev/null\n@@ -1,118 +0,0 @@\n-[buildout]\n-package-name = plone.app.multilingual\n-package-extras = [test]\n-\n-extensions =\n- mr.developer\n-\n-auto-checkout =\n- archetypes.multilingual\n- archetypes.testcase\n-\n-versions = versions\n-sources-dir = extras\n-always-checkout = force\n-\n-eggs =\n- Pillow\n- archetypes.multilingual\n- archetypes.testcase\n-\n-test-eggs =\n- Pillow\n- plone.app.multilingual[test]\n- archetypes.multilingual[test]\n-\n-parts +=\n- zopepy\n- i18ndude\n- releaser\n- ohcount\n- coverage\n- coverage-test\n- checkversions\n- omelette\n- code-analysis\n-\n-\n-[zopepy]\n-recipe = zc.recipe.egg\n-eggs = ${instance:eggs}\n-interpreter = zopepy\n-scripts = zopepy\n-\n-\n-[i18ndude]\n-unzip = true\n-recipe = zc.recipe.egg\n-eggs = i18ndude\n-\n-\n-[releaser]\n-recipe = zc.recipe.egg\n-eggs = jarn.mkrelease\n-\n-\n-[ohcount]\n-recipe = zc.recipe.egg\n-eggs = ohconvert\n-\n-\n-[coverage]\n-recipe = zc.recipe.egg\n-eggs = z3c.coverage\n-\n-\n-[coverage-test]\n-recipe = zc.recipe.testrunner\n-eggs = ${test:eggs}\n-defaults = ['--coverage', '../../coverage', '-v', '--auto-progress']\n-\n-\n-[checkversions]\n-recipe = zc.recipe.egg\n-eggs = z3c.checkversions [buildout]\n-\n-\n-[test]\n-# Override defaults to test all our eggs, see test-4.x.x for details:\n-# https://github.com/collective/buildout.plonetest/blob/master\n-eggs =\n- ${buildout:package-name} ${buildout:package-extras}\n- ${buildout:test-eggs}\n-defaults = ['--exit-with-status', '--auto-color', '--auto-progress',\n- '--verbose', '--ndiff']\n-\n-\n-[omelette]\n-recipe = collective.recipe.omelette\n-eggs = ${instance:eggs}\n-\n-\n-[code-analysis]\n-recipe = plone.recipe.codeanalysis\n-directory =\n- ${buildout:directory}/src\n- ${buildout:directory}/extras/archetypes.multilingual\n-# Conventions\n-flake8-max-complexity = 16\n-imports = True\n-prefer-single-quotes = False\n-debug-statements = True\n-# i18n\n-utf8-header = True\n-# Deprecation warnings\n-deprecated-aliases = True\n-\n-\n-[versions]\n-setuptools = >=7.0\n-zc.buildout = >=2.2.5\n-coverage =\n-\n-# Unpin this product so we are testing development code\n-plone.app.multilingual =\n-\n-[sources]\n-archetypes.multilingual = git git://github.com/plone/archetypes.multilingual.git pushurl=git@github.com:plone/archetypes.multilingual.git\n-archetypes.testcase = git git://github.com/sneridagh/archetypes.testcase.git pushurl=git@github.com:sneridagh/archetypes.testcase.git\n" | ||
|
|
||
| Repository: plone.app.multilingual | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2019-07-05T11:11:22+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/plone.app.multilingual/commit/d79b3fa8d89f63e5b13ac2c319500e80664e91a1 | ||
|
|
||
| decorator is no longer needed | ||
|
|
||
| Files changed: | ||
| A news/357.bugfix | ||
| M setup.py | ||
|
|
||
| b'diff --git a/news/357.bugfix b/news/357.bugfix\nnew file mode 100644\nindex 00000000..aadfb7fe\n--- /dev/null\n+++ b/news/357.bugfix\n@@ -0,0 +1,5 @@\n+Remove any dependency to ``archetypes.multilingual``, since this is a indirection.\n+Remove all dependencies that are already part of ``Products.CMFPlone``.\n+All version specifications were reduced to use a recent ``Products.CMFPlone``.\n+The ``decorator`` dependency is no longer used.\n+[jensens]\ndiff --git a/setup.py b/setup.py\nindex 39ed5c18..b1819d6e 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -49,7 +49,6 @@\n \'test\': [\n \'plone.app.testing[robot]\',\n \'plone.app.robotframework\',\n- \'decorator\', # BBB\n ],\n },\n entry_points="""\n' | ||
|
|
||
| Repository: plone.app.multilingual | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2019-07-05T13:49:58+02:00 | ||
| Author: Jens W. Klein (jensens) <jk@kleinundpartner.at> | ||
| Commit: https://github.com/plone/plone.app.multilingual/commit/ab0b5d776b77415472cfdfcd4711151f7f1b135e | ||
|
|
||
| Merge pull request #357 from plone/cleanup-setup | ||
|
|
||
| Cleanup setup | ||
| add missing information about an upgrade step | ||
|
|
||
| Files changed: | ||
| A news/357.bugfix | ||
| M .gitignore | ||
| M setup.py | ||
| D buildout.cfg | ||
| D jenkins.cfg | ||
| D test-plone-5.0.x.cfg | ||
| D test-plone-5.1.x.cfg | ||
| D test-plone-5.x.cfg | ||
| M README.rst | ||
|
|
||
| b'diff --git a/.gitignore b/.gitignore\nindex 5894cbb6..3a725158 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -31,9 +31,6 @@ MKcodeintel\n # Mac\n .DS_Store\n \n-# Local development\n-local.cfg\n-\n # Emacs\n .emacs.desktop*\n \ndiff --git a/buildout.cfg b/buildout.cfg\ndeleted file mode 100644\nindex d0f1508a..00000000\n--- a/buildout.cfg\n+++ /dev/null\n@@ -1,3 +0,0 @@\n-[buildout]\n-extends =\n- test-plone-5.1.x.cfg\ndiff --git a/jenkins.cfg b/jenkins.cfg\ndeleted file mode 100644\nindex 3c2ccdc5..00000000\n--- a/jenkins.cfg\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-[buildout]\n-extends =\n- buildout.cfg\n- https://raw.github.com/plone/buildout.jenkins/master/jenkins.cfg\n- https://raw.github.com/plone/buildout.jenkins/master/jenkins-code-analysis.cfg\n-jenkins-test-eggs =\n- plone.app.multilingual[test]\n- archetypes.multilingual[test]\n-jenkins-test-directories =\n- src/plone/app/multilingual\n- extras/archetypes.multilingual/src/archetypes/multilingual\n-\ndiff --git a/news/357.bugfix b/news/357.bugfix\nnew file mode 100644\nindex 00000000..aadfb7fe\n--- /dev/null\n+++ b/news/357.bugfix\n@@ -0,0 +1,5 @@\n+Remove any dependency to ``archetypes.multilingual``, since this is a indirection.\n+Remove all dependencies that are already part of ``Products.CMFPlone``.\n+All version specifications were reduced to use a recent ``Products.CMFPlone``.\n+The ``decorator`` dependency is no longer used.\n+[jensens]\ndiff --git a/setup.py b/setup.py\nindex 54563329..b1819d6e 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -38,29 +38,17 @@\n include_package_data=True,\n zip_safe=False,\n install_requires=[\n- \'Products.CMFPlone>=5.0b1\',\n- \'Products.GenericSetup>=1.8.2\',\n- # we want p.a.layout >= 2.5.22 on 2.5.x branch OR >= 2.6.3\n- \'plone.app.layout>=2.5.22,!=2.6.0,!=2.6.1,!=2.6.2\',\n- \'plone.app.registry\',\n- \'plone.app.z3cform\',\n- \'plone.behavior\',\n- \'plone.dexterity\',\n+ \'Products.CMFPlone>=5.2rc4\',\n \'setuptools\',\n \'six\',\n- \'z3c.relationfield\',\n- \'zope.publisher\',\n ],\n extras_require={\n \'archetypes\': [\n \'archetypes.multilingual\',\n ],\n \'test\': [\n- \'plone.app.testing[robot]>=4.2.2\',\n+ \'plone.app.testing[robot]\',\n \'plone.app.robotframework\',\n- \'plone.app.contenttypes\',\n- \'archetypes.multilingual\',\n- \'decorator\', # BBB\n ],\n },\n entry_points="""\ndiff --git a/test-plone-5.0.x.cfg b/test-plone-5.0.x.cfg\ndeleted file mode 100644\nindex 139db4c2..00000000\n--- a/test-plone-5.0.x.cfg\n+++ /dev/null\n@@ -1,11 +0,0 @@\n-[buildout]\n-extends =\n- https://raw.github.com/collective/buildout.plonetest/master/test-5.0.x.cfg\n- test-plone-5.x.cfg\n-\n-plone-series = 5.0\n-\n-[versions]\n-# Plone 5.0 needs a plone.app.layout release from the 2.5.x series\n-plone.app.layout = 2.5.22\n-coverage = >=4.2\n\\ No newline at end of file\ndiff --git a/test-plone-5.1.x.cfg b/test-plone-5.1.x.cfg\ndeleted file mode 100644\nindex 8258d2ba..00000000\n--- a/test-plone-5.1.x.cfg\n+++ /dev/null\n@@ -1,12 +0,0 @@\n-[buildout]\n-extends =\n- https://raw.github.com/collective/buildout.plonetest/master/test-5.1.x.cfg\n- test-plone-5.x.cfg\n-\n-plone-series = 5.1\n-\n-[versions]\n-# Plone 5.1 needs a plone.app.layout release from the 2.6.x series\n-plone.app.layout = 2.6.3\n-setuptools = 34.3.0\n-zc.buildout = 2.8.0\ndiff --git a/test-plone-5.x.cfg b/test-plone-5.x.cfg\ndeleted file mode 100644\nindex 686e2876..00000000\n--- a/test-plone-5.x.cfg\n+++ /dev/null\n@@ -1,118 +0,0 @@\n-[buildout]\n-package-name = plone.app.multilingual\n-package-extras = [test]\n-\n-extensions =\n- mr.developer\n-\n-auto-checkout =\n- archetypes.multilingual\n- archetypes.testcase\n-\n-versions = versions\n-sources-dir = extras\n-always-checkout = force\n-\n-eggs =\n- Pillow\n- archetypes.multilingual\n- archetypes.testcase\n-\n-test-eggs =\n- Pillow\n- plone.app.multilingual[test]\n- archetypes.multilingual[test]\n-\n-parts +=\n- zopepy\n- i18ndude\n- releaser\n- ohcount\n- coverage\n- coverage-test\n- checkversions\n- omelette\n- code-analysis\n-\n-\n-[zopepy]\n-recipe = zc.recipe.egg\n-eggs = ${instance:eggs}\n-interpreter = zopepy\n-scripts = zopepy\n-\n-\n-[i18ndude]\n-unzip = true\n-recipe = zc.recipe.egg\n-eggs = i18ndude\n-\n-\n-[releaser]\n-recipe = zc.recipe.egg\n-eggs = jarn.mkrelease\n-\n-\n-[ohcount]\n-recipe = zc.recipe.egg\n-eggs = ohconvert\n-\n-\n-[coverage]\n-recipe = zc.recipe.egg\n-eggs = z3c.coverage\n-\n-\n-[coverage-test]\n-recipe = zc.recipe.testrunner\n-eggs = ${test:eggs}\n-defaults = [\'--coverage\', \'../../coverage\', \'-v\', \'--auto-progress\']\n-\n-\n-[checkversions]\n-recipe = zc.recipe.egg\n-eggs = z3c.checkversions [buildout]\n-\n-\n-[test]\n-# Override defaults to test all our eggs, see test-4.x.x for details:\n-# https://github.com/collective/buildout.plonetest/blob/master\n-eggs =\n- ${buildout:package-name} ${buildout:package-extras}\n- ${buildout:test-eggs}\n-defaults = [\'--exit-with-status\', \'--auto-color\', \'--auto-progress\',\n- \'--verbose\', \'--ndiff\']\n-\n-\n-[omelette]\n-recipe = collective.recipe.omelette\n-eggs = ${instance:eggs}\n-\n-\n-[code-analysis]\n-recipe = plone.recipe.codeanalysis\n-directory =\n- ${buildout:directory}/src\n- ${buildout:directory}/extras/archetypes.multilingual\n-# Conventions\n-flake8-max-complexity = 16\n-imports = True\n-prefer-single-quotes = False\n-debug-statements = True\n-# i18n\n-utf8-header = True\n-# Deprecation warnings\n-deprecated-aliases = True\n-\n-\n-[versions]\n-setuptools = >=7.0\n-zc.buildout = >=2.2.5\n-coverage =\n-\n-# Unpin this product so we are testing development code\n-plone.app.multilingual =\n-\n-[sources]\n-archetypes.multilingual = git git://github.com/plone/archetypes.multilingual.git pushurl=git@github.com:plone/archetypes.multilingual.git\n-archetypes.testcase = git git://github.com/sneridagh/archetypes.testcase.git pushurl=git@github.com:sneridagh/archetypes.testcase.git\n' | ||
| b'diff --git a/README.rst b/README.rst\nindex 2a5e9fc..5d08d05 100644\n--- a/README.rst\n+++ b/README.rst\n@@ -33,7 +33,9 @@ How to upgrade the resources in this package\n \n 4. Increase the ``last_compilation`` date in ``src/plone/staticresources/profiles/default/registry/bundles.xml``.\n \n-5. Submit a Pull Request and run the tests on Jenkins.\n+5. Create an upgrade step for ``plone.app.upgrade``.\n+\n+6. Submit a Pull Request and run the tests on Jenkins.\n \n \n What has changed\n' | ||
|
|