Skip to content

Commit

Permalink
[fc] Repository: plone.app.event
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2019-02-15T12:07:25+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.event@dbeca8e

close files in tests

Files changed:
M plone/app/event/tests/test_icalendar.py
Repository: plone.app.event

Branch: refs/heads/master
Date: 2019-02-21T07:58:48+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.event@d7d1155

add changelog

Files changed:
A news/300.bugfix
Repository: plone.app.event

Branch: refs/heads/master
Date: 2019-02-21T07:59:12+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.event@e87103b

Merge pull request #300 from plone/close_files

close files in tests

Files changed:
A news/300.bugfix
M plone/app/event/tests/test_icalendar.py
  • Loading branch information
@pbauer
pbauer committed Feb 21, 2019
1 parent 05d2a87 commit 34fd3a4
Showing 1 changed file with 23 additions and 43 deletions.
66 changes: 23 additions & 43 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,68 +1,48 @@
Repository: plone.app.upgrade
Repository: plone.app.event


Branch: refs/heads/master
Date: 2019-02-19T01:07:27+01:00
Author: Davi Lima (davilima6) <davilima6@gmail.com>
Commit: https://github.com/plone/plone.app.upgrade/commit/4869bab375c19888e177c9776c647b2933f5a987
Date: 2019-02-15T12:07:25+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.app.event/commit/dbeca8ec0a360ee6b1e141f97068834918d82047

Initiate Upgrade profile for Plone 5.2beta2
close files in tests

Files changed:
M plone/app/upgrade/v52/betas.py
M plone/app/upgrade/v52/configure.zcml
M plone/app/upgrade/v52/profiles.zcml
M plone/app/event/tests/test_icalendar.py

b'diff --git a/plone/app/upgrade/v52/betas.py b/plone/app/upgrade/v52/betas.py\nindex 925ef0e9..a7ac0210 100644\n--- a/plone/app/upgrade/v52/betas.py\n+++ b/plone/app/upgrade/v52/betas.py\n@@ -101,3 +101,7 @@ def to52beta1(context):\n add_exclude_from_nav_index(context)\n remove_legacy_resource_registries(context)\n remove_interface_indexes_from_relations_catalog()\n+\n+\n+def to52beta2(context):\n+ loadMigrationProfile(context, \'profile-plone.app.upgrade.v52:to52beta2\')\ndiff --git a/plone/app/upgrade/v52/configure.zcml b/plone/app/upgrade/v52/configure.zcml\nindex 09880bfa..befd1a35 100644\n--- a/plone/app/upgrade/v52/configure.zcml\n+++ b/plone/app/upgrade/v52/configure.zcml\n@@ -43,6 +43,11 @@\n handler=".betas.to52beta1"\n />\n \n+ <gs:upgradeStep\n+ title="Run to52beta2 upgrade profile."\n+ description=""\n+ handler=".betas.to52beta2"\n+ />\n </gs:upgradeSteps>\n \n </configure>\ndiff --git a/plone/app/upgrade/v52/profiles.zcml b/plone/app/upgrade/v52/profiles.zcml\nindex 7726c8e2..58e73510 100644\n--- a/plone/app/upgrade/v52/profiles.zcml\n+++ b/plone/app/upgrade/v52/profiles.zcml\n@@ -21,4 +21,12 @@\n provides="Products.GenericSetup.interfaces.EXTENSION"\n />\n \n+ <genericsetup:registerProfile\n+ name="to52beta2"\n+ title="Upgrade profile for Plone 5.2beta1 to Plone 5.2beta2"\n+ description=""\n+ directory="profiles/to_beta2"\n+ for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"\n+ provides="Products.GenericSetup.interfaces.EXTENSION"\n+ />\n </configure>\n'
b"diff --git a/plone/app/event/tests/test_icalendar.py b/plone/app/event/tests/test_icalendar.py\nindex a479bc93..a279ab75 100644\n--- a/plone/app/event/tests/test_icalendar.py\n+++ b/plone/app/event/tests/test_icalendar.py\n@@ -289,8 +289,9 @@ def test_import_from_ics(self):\n impfolder = self.portal.impfolder1\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n- res = ical_import(impfolder, icsfile, self.event_type)\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata = icsfile.read()\n+ res = ical_import(impfolder, icsdata, self.event_type)\n \n self.assertEqual(res['count'], 5)\n self.assertEqual(len(impfolder.contentIds()), 5)\n@@ -403,15 +404,17 @@ def test_import_from_ics__no_sync(self):\n impfolder = self.portal.impfolder2\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata = icsfile.read()\n+\n+ res = ical_import(impfolder, icsdata, self.event_type)\n \n- res = ical_import(impfolder, icsfile, self.event_type)\n self.assertEqual(res['count'], 5)\n \n e11 = impfolder['e1']\n suid1 = IEventAccessor(e11).sync_uid\n \n- res = ical_import(impfolder, icsfile, self.event_type,\n+ res = ical_import(impfolder, icsdata, self.event_type,\n sync_strategy=base.SYNC_NONE)\n self.assertEqual(res['count'], 5)\n \n@@ -428,16 +431,17 @@ def test_import_from_ics__sync_keep_mine(self):\n impfolder = self.portal.impfolder3\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata = icsfile.read()\n \n- res = ical_import(impfolder, icsfile, self.event_type)\n+ res = ical_import(impfolder, icsdata, self.event_type)\n self.assertEqual(res['count'], 5)\n \n e1a = IEventAccessor(impfolder.e1)\n mod1 = e1a.last_modified\n suid1 = e1a.sync_uid\n \n- res = ical_import(impfolder, icsfile, self.event_type,\n+ res = ical_import(impfolder, icsdata, self.event_type,\n sync_strategy=base.SYNC_KEEP_MINE)\n self.assertEqual(res['count'], 0)\n e1a = IEventAccessor(impfolder.e1)\n@@ -457,10 +461,13 @@ def test_import_from_ics__sync_drop_older(self):\n impfolder = self.portal.impfolder4\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n- icsfile2 = open(os.path.join(directory, 'icaltest2.ics'), 'rb').read()\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata1 = icsfile.read()\n+\n+ with open(os.path.join(directory, 'icaltest2.ics'), 'rb') as icsfile:\n+ icsdata2 = icsfile.read()\n \n- res = ical_import(impfolder, icsfile, self.event_type)\n+ res = ical_import(impfolder, icsdata1, self.event_type)\n self.assertEqual(res['count'], 5)\n \n e1a = IEventAccessor(impfolder.e1)\n@@ -471,7 +478,7 @@ def test_import_from_ics__sync_drop_older(self):\n start1 = e1a.start\n end1 = e1a.end\n \n- res = ical_import(impfolder, icsfile2, self.event_type,\n+ res = ical_import(impfolder, icsdata2, self.event_type,\n sync_strategy=base.SYNC_KEEP_NEWER)\n self.assertEqual(res['count'], 4)\n e1a = IEventAccessor(impfolder.e1)\n@@ -499,10 +506,14 @@ def test_import_from_ics__sync_keep_theirs(self):\n impfolder = self.portal.impfolder5\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n- icsfile2 = open(os.path.join(directory, 'icaltest2.ics'), 'rb').read()\n \n- res = ical_import(impfolder, icsfile, self.event_type)\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata1 = icsfile.read()\n+\n+ with open(os.path.join(directory, 'icaltest2.ics'), 'rb') as icsfile:\n+ icsdata2 = icsfile.read()\n+\n+ res = ical_import(impfolder, icsdata1, self.event_type)\n self.assertEqual(res['count'], 5)\n \n e1a = IEventAccessor(impfolder.e1)\n@@ -520,7 +531,7 @@ def test_import_from_ics__sync_keep_theirs(self):\n start21 = e2a.start\n end21 = e2a.end\n \n- res = ical_import(impfolder, icsfile2, self.event_type,\n+ res = ical_import(impfolder, icsdata2, self.event_type,\n sync_strategy=base.SYNC_KEEP_THEIRS)\n self.assertEqual(res['count'], 5)\n \n"

Repository: plone.app.upgrade
Repository: plone.app.event


Branch: refs/heads/master
Date: 2019-02-19T01:08:32+01:00
Author: Davi Lima (davilima6) <davilima6@gmail.com>
Commit: https://github.com/plone/plone.app.upgrade/commit/9b89d381d46d5d975b7d0c8869018e3dc1a792ee
Date: 2019-02-21T07:58:48+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.app.event/commit/d7d1155781b7df6b00fa7eb982b2de78254975c5

Add new registry/resources upgrade step to update 'moment' resource to use version without locales, which are now lazy loaded
add changelog

Files changed:
A plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml
A news/300.bugfix

b'diff --git a/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml b/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml\nnew file mode 100644\nindex 00000000..195076b3\n--- /dev/null\n+++ b/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml\n@@ -0,0 +1,10 @@\n+<?xml version="1.0"?>\n+<registry>\n+\n+ <records prefix="plone.resources/moment"\n+ interface=\'Products.CMFPlone.interfaces.IResourceRegistry\'>\n+ <value key="js">++plone++static/components/moment/min/moment.min.js</value>\n+ <value key="url">++plone++static/components/moment/locale</value>\n+ </records>\n+\n+</registry>\n'
b'diff --git a/news/300.bugfix b/news/300.bugfix\nnew file mode 100644\nindex 00000000..412f6ef6\n--- /dev/null\n+++ b/news/300.bugfix\n@@ -0,0 +1 @@\n+Close files in tests\n\\ No newline at end of file\n'

Repository: plone.app.upgrade
Repository: plone.app.event


Branch: refs/heads/master
Date: 2019-02-19T01:13:01+01:00
Author: Davi Lima (davilima6) <davilima6@gmail.com>
Commit: https://github.com/plone/plone.app.upgrade/commit/03321003eb87934dfde156317dbdebf8ab272755
Date: 2019-02-21T07:59:12+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: https://github.com/plone/plone.app.event/commit/e87103b99ec47386cdf0704e3be48c49ca00a92d

Add towncrier entry (changelog)
Merge pull request #300 from plone/close_files

Files changed:
A news/199.news

b'diff --git a/news/199.news b/news/199.news\nnew file mode 100644\nindex 00000000..7aefd132\n--- /dev/null\n+++ b/news/199.news\n@@ -0,0 +1,5 @@\n+Add upgrade profile for Plone 5.2beta2\n+[davilima6]\n+\n+Add upgrade step for loading Moments.js without locales, which are now lazy loaded\n+[davilima6]\n'

Repository: plone.app.upgrade


Branch: refs/heads/master
Date: 2019-02-20T22:11:13+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.app.upgrade/commit/fea9f3fc9fb99fcdf2681b734ec11201df08835c

Merge pull request #199 from plone/momentjsLazyLoadLocales

Add profile for Plone 5.2b2; Start with new resources step…
close files in tests

Files changed:
A news/199.news
A plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml
M plone/app/upgrade/v52/betas.py
M plone/app/upgrade/v52/configure.zcml
M plone/app/upgrade/v52/profiles.zcml
A news/300.bugfix
M plone/app/event/tests/test_icalendar.py

b'diff --git a/news/199.news b/news/199.news\nnew file mode 100644\nindex 00000000..7aefd132\n--- /dev/null\n+++ b/news/199.news\n@@ -0,0 +1,5 @@\n+Add upgrade profile for Plone 5.2beta2\n+[davilima6]\n+\n+Add upgrade step for loading Moments.js without locales, which are now lazy loaded\n+[davilima6]\ndiff --git a/plone/app/upgrade/v52/betas.py b/plone/app/upgrade/v52/betas.py\nindex 8ba2c9fc..ad108059 100644\n--- a/plone/app/upgrade/v52/betas.py\n+++ b/plone/app/upgrade/v52/betas.py\n@@ -102,3 +102,7 @@ def to52beta1(context):\n add_exclude_from_nav_index(context)\n remove_legacy_resource_registries(context)\n remove_interface_indexes_from_relations_catalog()\n+\n+\n+def to52beta2(context):\n+ loadMigrationProfile(context, \'profile-plone.app.upgrade.v52:to52beta2\')\ndiff --git a/plone/app/upgrade/v52/configure.zcml b/plone/app/upgrade/v52/configure.zcml\nindex 09880bfa..befd1a35 100644\n--- a/plone/app/upgrade/v52/configure.zcml\n+++ b/plone/app/upgrade/v52/configure.zcml\n@@ -43,6 +43,11 @@\n handler=".betas.to52beta1"\n />\n \n+ <gs:upgradeStep\n+ title="Run to52beta2 upgrade profile."\n+ description=""\n+ handler=".betas.to52beta2"\n+ />\n </gs:upgradeSteps>\n \n </configure>\ndiff --git a/plone/app/upgrade/v52/profiles.zcml b/plone/app/upgrade/v52/profiles.zcml\nindex 7726c8e2..58e73510 100644\n--- a/plone/app/upgrade/v52/profiles.zcml\n+++ b/plone/app/upgrade/v52/profiles.zcml\n@@ -21,4 +21,12 @@\n provides="Products.GenericSetup.interfaces.EXTENSION"\n />\n \n+ <genericsetup:registerProfile\n+ name="to52beta2"\n+ title="Upgrade profile for Plone 5.2beta1 to Plone 5.2beta2"\n+ description=""\n+ directory="profiles/to_beta2"\n+ for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"\n+ provides="Products.GenericSetup.interfaces.EXTENSION"\n+ />\n </configure>\ndiff --git a/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml b/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml\nnew file mode 100644\nindex 00000000..195076b3\n--- /dev/null\n+++ b/plone/app/upgrade/v52/profiles/to_beta2/registry/resources.xml\n@@ -0,0 +1,10 @@\n+<?xml version="1.0"?>\n+<registry>\n+\n+ <records prefix="plone.resources/moment"\n+ interface=\'Products.CMFPlone.interfaces.IResourceRegistry\'>\n+ <value key="js">++plone++static/components/moment/min/moment.min.js</value>\n+ <value key="url">++plone++static/components/moment/locale</value>\n+ </records>\n+\n+</registry>\n'
b"diff --git a/news/300.bugfix b/news/300.bugfix\nnew file mode 100644\nindex 00000000..412f6ef6\n--- /dev/null\n+++ b/news/300.bugfix\n@@ -0,0 +1 @@\n+Close files in tests\n\\ No newline at end of file\ndiff --git a/plone/app/event/tests/test_icalendar.py b/plone/app/event/tests/test_icalendar.py\nindex a479bc93..a279ab75 100644\n--- a/plone/app/event/tests/test_icalendar.py\n+++ b/plone/app/event/tests/test_icalendar.py\n@@ -289,8 +289,9 @@ def test_import_from_ics(self):\n impfolder = self.portal.impfolder1\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n- res = ical_import(impfolder, icsfile, self.event_type)\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata = icsfile.read()\n+ res = ical_import(impfolder, icsdata, self.event_type)\n \n self.assertEqual(res['count'], 5)\n self.assertEqual(len(impfolder.contentIds()), 5)\n@@ -403,15 +404,17 @@ def test_import_from_ics__no_sync(self):\n impfolder = self.portal.impfolder2\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata = icsfile.read()\n+\n+ res = ical_import(impfolder, icsdata, self.event_type)\n \n- res = ical_import(impfolder, icsfile, self.event_type)\n self.assertEqual(res['count'], 5)\n \n e11 = impfolder['e1']\n suid1 = IEventAccessor(e11).sync_uid\n \n- res = ical_import(impfolder, icsfile, self.event_type,\n+ res = ical_import(impfolder, icsdata, self.event_type,\n sync_strategy=base.SYNC_NONE)\n self.assertEqual(res['count'], 5)\n \n@@ -428,16 +431,17 @@ def test_import_from_ics__sync_keep_mine(self):\n impfolder = self.portal.impfolder3\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata = icsfile.read()\n \n- res = ical_import(impfolder, icsfile, self.event_type)\n+ res = ical_import(impfolder, icsdata, self.event_type)\n self.assertEqual(res['count'], 5)\n \n e1a = IEventAccessor(impfolder.e1)\n mod1 = e1a.last_modified\n suid1 = e1a.sync_uid\n \n- res = ical_import(impfolder, icsfile, self.event_type,\n+ res = ical_import(impfolder, icsdata, self.event_type,\n sync_strategy=base.SYNC_KEEP_MINE)\n self.assertEqual(res['count'], 0)\n e1a = IEventAccessor(impfolder.e1)\n@@ -457,10 +461,13 @@ def test_import_from_ics__sync_drop_older(self):\n impfolder = self.portal.impfolder4\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n- icsfile2 = open(os.path.join(directory, 'icaltest2.ics'), 'rb').read()\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata1 = icsfile.read()\n+\n+ with open(os.path.join(directory, 'icaltest2.ics'), 'rb') as icsfile:\n+ icsdata2 = icsfile.read()\n \n- res = ical_import(impfolder, icsfile, self.event_type)\n+ res = ical_import(impfolder, icsdata1, self.event_type)\n self.assertEqual(res['count'], 5)\n \n e1a = IEventAccessor(impfolder.e1)\n@@ -471,7 +478,7 @@ def test_import_from_ics__sync_drop_older(self):\n start1 = e1a.start\n end1 = e1a.end\n \n- res = ical_import(impfolder, icsfile2, self.event_type,\n+ res = ical_import(impfolder, icsdata2, self.event_type,\n sync_strategy=base.SYNC_KEEP_NEWER)\n self.assertEqual(res['count'], 4)\n e1a = IEventAccessor(impfolder.e1)\n@@ -499,10 +506,14 @@ def test_import_from_ics__sync_keep_theirs(self):\n impfolder = self.portal.impfolder5\n \n directory = os.path.dirname(__file__)\n- icsfile = open(os.path.join(directory, 'icaltest.ics'), 'rb').read()\n- icsfile2 = open(os.path.join(directory, 'icaltest2.ics'), 'rb').read()\n \n- res = ical_import(impfolder, icsfile, self.event_type)\n+ with open(os.path.join(directory, 'icaltest.ics'), 'rb') as icsfile:\n+ icsdata1 = icsfile.read()\n+\n+ with open(os.path.join(directory, 'icaltest2.ics'), 'rb') as icsfile:\n+ icsdata2 = icsfile.read()\n+\n+ res = ical_import(impfolder, icsdata1, self.event_type)\n self.assertEqual(res['count'], 5)\n \n e1a = IEventAccessor(impfolder.e1)\n@@ -520,7 +531,7 @@ def test_import_from_ics__sync_keep_theirs(self):\n start21 = e2a.start\n end21 = e2a.end\n \n- res = ical_import(impfolder, icsfile2, self.event_type,\n+ res = ical_import(impfolder, icsdata2, self.event_type,\n sync_strategy=base.SYNC_KEEP_THEIRS)\n self.assertEqual(res['count'], 5)\n \n"

0 comments on commit 34fd3a4

Please sign in to comment.