Merge pull request #77 from plone/version-bumps

Version bumps

buildout.cfg

@@ -69,19 +69,13 @@ recipe = zc.recipe.egg
 eggs = plone.versioncheck
 
 [versions]
-atomicwrites = 1.3.0
-beautifulsoup4 = 4.8.1
-CacheControl = 0.12.5
-certifi = 2019.9.11
-Chameleon = 3.6.2
+CacheControl = 0.12.6
+certifi = 2019.11.28
 chardet = 3.0.4
-check-manifest = 0.40
 collective.recipe.omelette = 0.16
-colorama = 0.4.1
-configparser = 4.0.2
-cornice = 3.6.0
-coverage = 4.5.4
-Deprecated = 1.2.6
+cornice = 4.0.1
+coverage = 5.0.3
+Deprecated = 1.2.7
 flake8 = 3.6.0
 flake8-blind-except = 0.1.1
 flake8-coding = 1.3.1
@@ -94,64 +88,130 @@ flake8-quotes = 1.0.0
 flake8-string-format = 0.2.3
 flake8-todo = 0.7
 gitdb2 = 2.0.6
-GitPython = 2.1.14
-hupper = 1.9
+GitPython = 3.0.5
+hupper = 1.9.1
 idna = 2.8
-importlib-metadata = 0.23
-Jinja2 = 2.10
+importlib-metadata = 1.4.0
+Jinja2 = 2.10.3
 lockfile = 0.12.2
-lxml = 4.3.5
-Mako = 1.1.0
+Mako = 1.1.1
 MarkupSafe = 1.1.1
 mccabe = 0.6.1
 mock = 3.0.5
-more-itertools = 7.2.0
+more-itertools = 8.1.0
 msgpack = 0.6.2
-packaging = 19.2
-Paste = 3.2.2
+Paste = 3.2.6
 PasteDeploy = 2.0.1
-pbr = 5.4.3
 pep8-naming = 0.7.0
-plaster = 1.0
-plaster-pastedeploy = 0.7
 plone.recipe.codeanalysis = 3.0.1
 plone.versioncheck = 1.7.0
-pluggy = 0.13.0
-py = 1.8.0
+pluggy = 0.13.1
+py = 1.8.1
 pycodestyle = 2.4.0
 pyflakes = 2.0.0
-PyGithub = 1.44
-Pygments = 2.4.2
 PyJWT = 1.7.1
-pyparsing = 2.4.2
+pyparsing = 2.4.6
 pyramid = 1.10.4
 pyramid-chameleon = 0.3
-pyramid-debugtoolbar = 4.5
+pyramid-debugtoolbar = 4.6
 pyramid-mailer = 0.15.1
 pyramid-mako = 1.1.0
-pytest = 5.2.2
+pytest = 5.3.4
 pytest-cov = 2.8.1
-repoze.lru = 0.7
 repoze.sendmail = 4.4.1
-requests = 2.22.0
 setuptools = 41.6.0
-simplejson = 3.16.0
-six = 1.12.0
 smmap2 = 2.0.5
-soupsieve = 1.9.4
-testfixtures = 6.10.1
-transaction = 2.4.0
+soupsieve = 1.9.5
+testfixtures = 6.10.3
 translationstring = 1.3
-unidiff = 0.5.4
-urllib3 = 1.25.6
-venusian = 1.2.0
-waitress = 1.3.1
-wcwidth = 0.1.7
-WebOb = 1.8.5
-WebTest = 2.0.32
+urllib3 = 1.25.8
+waitress = 1.4.2
+WebOb = 1.8.6
+WebTest = 2.0.33
 wrapt = 1.11.2
 zc.buildout = 2.13.2
 zc.recipe.egg = 2.0.7
-zipp = 0.6.0
+zipp = 2.1.0
 zope.deprecation = 4.4.0
-zope.interface = 4.6.0
+zope.interface = 4.7.1
+
+# Required by:
+# pyramid-chameleon==0.3
+Chameleon = 3.6.2
+
+# Required by:
+# mr.roboto==2.0
+PyGithub = 1.45
+
+# Required by:
+# pyramid-debugtoolbar==4.5
+Pygments = 2.5.2
+
+# Required by:
+# WebTest==2.0.33
+beautifulsoup4 = 4.8.2
+
+# Required by:
+# plone.recipe.codeanalysis==3.0.1
+check-manifest = 0.40
+
+# Required by:
+# plone.versioncheck==1.7.0
+colorama = 0.4.3
+
+# Required by:
+# mr.roboto==2.0
+configparser = 4.0.2
+
+# Required by:
+# plone.recipe.codeanalysis==3.0.1
+lxml = 4.4.2
+
+# Required by:
+# pytest==5.3.4
+packaging = 20.1
+
+# Required by:
+# pyramid==1.10.4
+plaster = 1.0
+
+# Required by:
+# pyramid==1.10.4
+plaster-pastedeploy = 0.7
+
+# Required by:
+# pyramid-debugtoolbar==4.5
+repoze.lru = 0.7
+
+# Required by:
+# mr.roboto==2.0
+# plone.versioncheck==1.7.0
+requests = 2.22.0
+
+# Required by:
+# cornice==4.0.1
+simplejson = 3.17.0
+
+# Required by:
+# PyGithub==1.45
+# WebTest==2.0.33
+# cornice==4.0.1
+# flake8-print==3.1.0
+# mock==3.0.5
+six = 1.14.0
+
+# Required by:
+# pyramid-mailer==0.15.1
+transaction = 3.0.0
+
+# Required by:
+# mr.roboto==2.0
+unidiff = 0.5.4
+
+# Required by:
+# cornice==4.0.1
+venusian = 3.0.0
+
+# Required by:
+# pytest==5.3.4
+wcwidth = 0.1.7

requirements.txt

@@ -1,4 +1,4 @@
-meld3==1.0.2
+meld3==2.0.0
 supervisor==4.1.0
 setuptools==41.6.0
 zc.buildout==2.13.2

src/mr.roboto/src/mr/roboto/tests/test_buildout.py

@@ -4,7 +4,7 @@
 from mr.roboto.buildout import PloneCoreBuildout
 from tempfile import mkdtemp
 from tempfile import NamedTemporaryFile
-from webtest import TestApp
+from webtest import TestApp as BaseApp
 
 import os
 import pickle
@@ -60,7 +60,7 @@ def setUp(self):
             'github_token': 'x',
         }
         app = main({}, **self.settings)
-        self.roboto = TestApp(app)
+        self.roboto = BaseApp(app)
 
     def tearDown(self):
         shutil.rmtree(self.coredev_repo.working_tree_dir)

src/mr.roboto/src/mr/roboto/tests/test_comments.py

@@ -4,13 +4,12 @@
 from mr.roboto.subscriber import TriggerPullRequestJenkinsJobs
 from tempfile import NamedTemporaryFile
 from testfixtures import LogCapture
-from webtest import TestApp
+from webtest import TestApp as BaseApp
 
 import copy
 import hmac
 import json
 import mock
-import os
 import pickle
 import unittest
 import urllib
@@ -114,10 +113,6 @@ def registry(self):
     def settings(self):
         return self._settings
 
-    @settings.setter
-    def settings(self, data):
-        self._settings = data
-
     def set_sources(self, data):
         with NamedTemporaryFile(delete=False) as tmp_file:
             sources_pickle = tmp_file.name
@@ -126,10 +121,6 @@ def set_sources(self, data):
 
         self._settings['sources_file'] = sources_pickle
 
-    def cleanup_sources(self):
-        if os.path.exists(self._settings['sources_file']):
-            os.remove(self._settings['sources_file'])
-
 
 def mocked_requests_get(*args, **kwargs):
     class MockResponse:
@@ -171,7 +162,7 @@ def setUp(self):
             'jenkins_user_token': 'some-random-token',
         }
         app = minimal_main({}, **self.settings)
-        self.roboto = TestApp(app)
+        self.roboto = BaseApp(app)
 
     def prepare_data(self, payload):
         body = urllib.parse.urlencode({'payload': json.dumps(payload)})

src/mr.roboto/src/mr/roboto/tests/test_config.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from mr.roboto import main
-from webtest import TestApp
+from webtest import TestApp as BaseApp
 
 import unittest
 
@@ -19,7 +19,7 @@ def setUp(self):
             'debug': 'True',
         }
         app = main({}, **settings)
-        self.roboto = TestApp(app)
+        self.roboto = BaseApp(app)
         self.settings = self.roboto.app.registry.settings
 
     def test_plone_versions(self):
@@ -60,6 +60,6 @@ def test_no_debug(self):
             'github_token': 'x',
         }
         app = main({}, **settings)
-        roboto = TestApp(app)
+        roboto = BaseApp(app)
         settings = roboto.app.registry.settings
         self.assertFalse(settings['debug'])

src/mr.roboto/src/mr/roboto/tests/test_pull_requests.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from hashlib import sha1
 from testfixtures import LogCapture
-from webtest import TestApp
+from webtest import TestApp as BaseApp
 
 import copy
 import hmac
@@ -64,7 +64,7 @@ def setUp(self):
             'github_token': 'x',
         }
         app = minimal_main({}, **self.settings)
-        self.roboto = TestApp(app)
+        self.roboto = BaseApp(app)
 
     def prepare_data(self, payload):
         body = urllib.parse.urlencode({'payload': json.dumps(payload)})

src/mr.roboto/src/mr/roboto/tests/test_runcorejob.py

@@ -3,7 +3,7 @@
 from mr.roboto.views.runcorejob import get_pickled_data
 from mr.roboto.views.runcorejob import get_user
 from tempfile import NamedTemporaryFile
-from webtest import TestApp
+from webtest import TestApp as BaseApp
 
 import copy
 import hmac
@@ -123,7 +123,7 @@ def setUp(self):
             'github_token': 'x',
         }
         app = minimal_main({}, **self.settings)
-        self.roboto = TestApp(app)
+        self.roboto = BaseApp(app)
 
     def tearDown(self):
         if os.path.exists(self.settings['checkouts_file']):
@@ -145,7 +145,7 @@ def populate_sources_and_checkouts(self, sources_data, checkouts_data):
         self.settings['sources_file'] = sources_pickle
         self.settings['checkouts_file'] = checkouts_pickle
         app = minimal_main({}, **self.settings)
-        self.roboto = TestApp(app)
+        self.roboto = BaseApp(app)
 
     def prepare_data(self, payload):
         body = urllib.parse.urlencode({'payload': json.dumps(payload)})

src/mr.roboto/src/mr/roboto/tests/test_runhooks.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from github.GithubException import GithubException
 from mr.roboto import main
-from webtest import TestApp
+from webtest import TestApp as BaseApp
 
 import mock
 import unittest
@@ -49,7 +49,7 @@ def setUp(self):
             'jenkins_url': 'https://jenkins.plone.org',
         }
         app = main({}, **self.settings)
-        self.roboto = TestApp(app)
+        self.roboto = BaseApp(app)
 
     def test_runhook_security(self):
         result = self.roboto.get('/run/githubcommithooks')

src/mr.roboto/src/mr/roboto/tests/test_simple_views.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from mr.roboto import main
 from mr.roboto.views.home import parse_log_line
-from webtest import TestApp
+from webtest import TestApp as BaseApp
 
 import mock
 import os
@@ -22,7 +22,7 @@ def setUp(self):
             'github_token': 'x',
         }
         app = main({}, **self.settings)
-        self.roboto = TestApp(app)
+        self.roboto = BaseApp(app)
 
     def clean_file(self, filename):
         try: