Skip to content

Commit

Permalink
Update buildout and versions (#10)
Browse files Browse the repository at this point in the history
* Add diffrents .cfg profiles for differents plone versions.

* Move buildout.cfg to base.cfg and load a default plone.x.cfg in buildout.cfg

* Pinned setuptools = 44.0.0

* Pinned setuptools = 44.0.0

* Updated classifiers (Plone and python versions)

* Travis : Another way to make buildout. copy plone.ver.x.cfg to buildout.cfg instead of using sed to change plone version with travis.

* Pinned distlib, pinned importlib-metadata
  • Loading branch information
boulch committed Nov 26, 2020
1 parent 402a13d commit df3bcc8
Show file tree
Hide file tree
Showing 9 changed files with 143 additions and 115 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -30,12 +30,12 @@ matrix:
before_install:
- sudo apt-get install -y firefox-geckodriver
- virtualenv -p `which python` .
- cp plone-$PLONE_VERSION.x.cfg buildout.cfg

install:
- echo $PLONE_VERSION
- echo $TEST_EGG
- sed -ie "s#5#$PLONE_VERSION#" buildout.cfg
- sed -ie "s#collective.messagesviewlet\[test\]#$TEST_EGG#" buildout.cfg
- sed -ie "s#collective.messagesviewlet\[test\]#$TEST_EGG#" base.cfg
- cat buildout.cfg
- bin/pip install -r requirements.txt
- bin/buildout -N buildout:download-cache=downloads code-analysis:return-status-codes=True annotate
Expand Down
111 changes: 111 additions & 0 deletions base.cfg
@@ -0,0 +1,111 @@
[buildout]
extends =
versions.cfg

extensions = mr.developer

parts =
instance
test
code-analysis
createcoverage
releaser
i18ndude
omelette
robot
resources

develop = .
show-picked-versions = true

always-checkout = force
auto-checkout +=
collective.behavior.talcondition

test-eggs = collective.messagesviewlet[test]

[remotes]
collective = https://github.com/collective
collective_push = git@github.com:collective

[sources]
collective.behavior.talcondition = git ${remotes:collective}/collective.behavior.talcondition.git pushurl=${remotes:collective_push}/collective.behavior.talcondition.git

[instance]
recipe = plone.recipe.zope2instance
user = admin:admin
http-address = 8080
debug-mode = on
verbose-security = on

eggs =
Plone
plone.app.workflowmanager
Pillow
collective.messagesviewlet
ipdb
iw.debug
zcml =
iw.debug
environment-vars =
zope_i18n_compile_mo_files true


[code-analysis]
recipe = plone.recipe.codeanalysis[recommended]
directory = ${buildout:directory}/src/collective
flake8-exclude = bootstrap.py,bootstrap-buildout.py,docs,*.egg.,omelette
flake8-ignore = W391
flake8-max-complexity = 15
flake8-max-line-length = 119
flake8-extensions =
flake8-blind-except
flake8-debugger
flake8-coding
return-status-codes = False

[omelette]
recipe = collective.recipe.omelette
eggs = ${instance:eggs}


[test]
recipe = zc.recipe.testrunner
eggs =
${instance:eggs}
${buildout:test-eggs}
robotframework-selenium2screenshots
defaults = ['-s', 'collective.messagesviewlet', '--auto-color', '--auto-progress']
environment = testenv


[testenv]
zope_i18n_compile_mo_files = true


[robot]
recipe = zc.recipe.egg
eggs =
${test:eggs}
plone.app.robotframework[debug]


[createcoverage]
recipe = zc.recipe.egg
eggs = createcoverage


[releaser]
recipe = zc.recipe.egg
eggs = zest.releaser


[i18ndude]
recipe = zc.recipe.egg
eggs = i18ndude


[resources]
recipe = zc.recipe.egg
eggs = Products.CMFPlone
scripts = plone-compile-resources
112 changes: 1 addition & 111 deletions buildout.cfg
@@ -1,112 +1,2 @@
[buildout]
extends =
https://raw.githubusercontent.com/collective/buildout.plonetest/master/plone-5.x.cfg
versions.cfg

extensions = mr.developer

parts =
instance
test
code-analysis
createcoverage
releaser
i18ndude
omelette
robot
resources

develop = .
show-picked-versions = true

always-checkout = force
auto-checkout +=
collective.behavior.talcondition

test-eggs = collective.messagesviewlet[test]

[remotes]
collective = https://github.com/collective
collective_push = git@github.com:collective

[sources]
collective.behavior.talcondition = git ${remotes:collective}/collective.behavior.talcondition.git pushurl=${remotes:collective_push}/collective.behavior.talcondition.git

[instance]
recipe = plone.recipe.zope2instance
user = admin:admin
http-address = 8080
debug-mode = on
verbose-security = on

eggs =
Plone
plone.app.workflowmanager
Pillow
collective.messagesviewlet
ipdb
iw.debug
zcml =
iw.debug
environment-vars =
zope_i18n_compile_mo_files true


[code-analysis]
recipe = plone.recipe.codeanalysis[recommended]
directory = ${buildout:directory}/src/collective
flake8-exclude = bootstrap.py,bootstrap-buildout.py,docs,*.egg.,omelette
flake8-ignore = W391
flake8-max-complexity = 15
flake8-max-line-length = 119
flake8-extensions =
flake8-blind-except
flake8-debugger
flake8-coding
return-status-codes = False

[omelette]
recipe = collective.recipe.omelette
eggs = ${instance:eggs}


[test]
recipe = zc.recipe.testrunner
eggs =
${instance:eggs}
${buildout:test-eggs}
robotframework-selenium2screenshots
defaults = ['-s', 'collective.messagesviewlet', '--auto-color', '--auto-progress']
environment = testenv


[testenv]
zope_i18n_compile_mo_files = true


[robot]
recipe = zc.recipe.egg
eggs =
${test:eggs}
plone.app.robotframework[debug]


[createcoverage]
recipe = zc.recipe.egg
eggs = createcoverage


[releaser]
recipe = zc.recipe.egg
eggs = zest.releaser


[i18ndude]
recipe = zc.recipe.egg
eggs = i18ndude


[resources]
recipe = zc.recipe.egg
eggs = Products.CMFPlone
scripts = plone-compile-resources
extends = plone-5.2.x.cfg
8 changes: 8 additions & 0 deletions plone-4.3.x.cfg
@@ -0,0 +1,8 @@
[buildout]
extends =
http://dist.plone.org/release/4.3-latest/versions.cfg
base.cfg

[versions]
traitlets = 4.3.2
distlib = 0.3.1
8 changes: 8 additions & 0 deletions plone-5.1.x.cfg
@@ -0,0 +1,8 @@
[buildout]
extends =
http://dist.plone.org/release/5.1-latest/versions.cfg
base.cfg

[versions]
traitlets = 4.3.2
distlib = 0.3.1
8 changes: 8 additions & 0 deletions plone-5.2.x.cfg
@@ -0,0 +1,8 @@
[buildout]
extends =
http://dist.plone.org/release/5.2-latest/versions.cfg
base.cfg

[versions]
traitlets = 4.3.2
importlib-metadata = 1.3.0
2 changes: 1 addition & 1 deletion requirements.txt
@@ -1,3 +1,3 @@
setuptools==38.5.1
setuptools==44.0.0
wheel==0.31.1
zc.buildout==2.13.2
3 changes: 3 additions & 0 deletions setup.py
Expand Up @@ -23,9 +23,12 @@
"Environment :: Web Environment",
"Framework :: Plone",
"Framework :: Plone :: 4.3",
"Framework :: Plone :: 5.1",
"Framework :: Plone :: 5.2",
"Framework :: Plone :: Addon",
"Programming Language :: Python",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.7",
"Operating System :: OS Independent",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
],
Expand Down
2 changes: 1 addition & 1 deletion versions.cfg
Expand Up @@ -13,6 +13,6 @@ robotframework-seleniumlibrary= 3.3.1
robotsuite = 2.0.0
selenium = 3.141.0

setuptools = 38.5.1
setuptools = 44.0.0
zc.buildout = 2.13.2
configparser = 3.8.1

0 comments on commit df3bcc8

Please sign in to comment.