[fc] Repository: icalendar

Branch: refs/heads/master Date: 2017-01-19T12:44:40+01:00 Author: Markus Unterwaditzer (untitaker) <markus@unterwaditzer.net> Commit: collective/icalendar@a01dda2 Remove custom merge strategy for changelog This causes old PRs to add the changelog entry to already released versions. It happened to me while rebasing #207 Files changed: D .gitattributes Repository: icalendar Branch: refs/heads/master Date: 2017-01-26T00:20:46+01:00 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> Commit: collective/icalendar@74ef4c1 Merge pull request #208 from untitaker/no-automerge Remove custom merge strategy for changelog Files changed: D .gitattributes
plone · Jan 25, 2017 · e492d1b · e492d1b
1 parent 69be73a
commit e492d1b
Showing 1 changed file with 29 additions and 130 deletions.
diff --git a/last_commit.txt b/last_commit.txt
@@ -2,149 +2,48 @@ Repository: icalendar
 
 
 Branch: refs/heads/master
-Date: 2017-01-24T07:06:08-08:00
-Author: Jon Dufresne (jdufresne) <jon.dufresne@gmail.com>
-Commit: https://github.com/collective/icalendar/commit/70985f19b275b079d33149d43b7272893fdb6d75
-
-Drop requirement for setuptools package from setup.py
-
-setuptools is shipped with Python, no need to include it as a requirement.
+Date: 2017-01-19T12:44:40+01:00
+Author: Markus Unterwaditzer (untitaker) <markus@unterwaditzer.net>
+Commit: https://github.com/collective/icalendar/commit/a01dda2eed22a4fa736dcfeed1a7579d66d02ccb
 
-Further, it is not used by the icalendar package, but only by setup.py.
+Remove custom merge strategy for changelog
 
-setuptools is imported by setup.py _before_ dependencies have been installed.
+This causes old PRs to add the changelog entry to already released
+versions. It happened to me while rebasing #207
 
 Files changed:
-M CHANGES.rst
-M README.rst
-M setup.py
-
-diff --git a/CHANGES.rst b/CHANGES.rst
-index 9b82786..1fd9f88 100644
---- a/CHANGES.rst
-+++ b/CHANGES.rst
-@@ -6,7 +6,8 @@ Changelog
-
- Breaking changes:
-
--- *add item here*
-+- Removed ``setuptools`` as a dependency as it was only required by setup.py
-+  and not by the package.
-
- New features:
-
-diff --git a/README.rst b/README.rst
-index 6fc08ae..b0531d5 100644
---- a/README.rst
-+++ b/README.rst
-@@ -10,7 +10,7 @@ with Python.
-     :Homepage: http://icalendar.readthedocs.org
-     :Code: http://github.com/collective/icalendar
-     :Mailing list: http://github.com/collective/icalendar/issues
--    :Dependencies: `setuptools`_ and since version 3.0 we depend on `pytz`_.
-+    :Dependencies: `python-dateutil`_ and `pytz`_.
-     :Compatible with: Python 2.6, 2.7 and 3.3+
-     :License: `BSD`_
-
-@@ -72,8 +72,8 @@ a suggestion to icalendar-dev@codespeak.net to take over maintaining of
- .. _`icalendar`: http://pypi.python.org/pypi/icalendar
- .. _`plone.app.event`: http://github.com/plone/plone.app.event
- .. _`Plone`: http://plone.org
-+.. _`python-dateutil`: https://github.com/dateutil/dateutil/
- .. _`pytz`: http://pypi.python.org/pypi/pytz
--.. _`setuptools`: http://pypi.python.org/pypi/setuptools
- .. _`RFC`: http://www.ietf.org/rfc/rfc5545.txt
- .. _`BSD`: https://github.com/collective/icalendar/issues/2
-
-@@ -96,4 +96,3 @@ Output from coverage test::
-     src/icalendar/tools               16      0   100%
-     --------------------------------------------------
-     TOTAL                           1152     81    93%
--
-diff --git a/setup.py b/setup.py
-index 4efc264..9ea69cb 100644
---- a/setup.py
-+++ b/setup.py
-@@ -22,7 +22,6 @@
- install_requires = [
-     'python-dateutil',
-     'pytz',
--    'setuptools',
- ]
-
- if sys.version_info[:2] == (2, 6):
+D .gitattributes
+
+diff --git a/.gitattributes b/.gitattributes
+deleted file mode 100644
+index 6f9ff67..0000000
+--- a/.gitattributes
++++ /dev/null
+@@ -1 +0,0 @@
+-CHANGES.rst merge=union
 
 
 Repository: icalendar
 
 
 Branch: refs/heads/master
-Date: 2017-01-25T20:11:38+01:00
-Author: Markus Unterwaditzer (untitaker) <markus@unterwaditzer.net>
-Commit: https://github.com/collective/icalendar/commit/4ff645203a3720093b23db8c8cc3f837428a85ef
+Date: 2017-01-26T00:20:46+01:00
+Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
+Commit: https://github.com/collective/icalendar/commit/74ef4c1f629482bc5760e7964021c2aacca9aa1f
 
-Merge pull request #211 from jdufresne/no-require-setuptools
+Merge pull request #208 from untitaker/no-automerge
 
-Drop requirement for setuptools package from setup.py
+Remove custom merge strategy for changelog
 
 Files changed:
-M CHANGES.rst
-M README.rst
-M setup.py
-
-diff --git a/CHANGES.rst b/CHANGES.rst
-index 9b82786..1fd9f88 100644
---- a/CHANGES.rst
-+++ b/CHANGES.rst
-@@ -6,7 +6,8 @@ Changelog
-
- Breaking changes:
-
--- *add item here*
-+- Removed ``setuptools`` as a dependency as it was only required by setup.py
-+  and not by the package.
-
- New features:
-
-diff --git a/README.rst b/README.rst
-index 6fc08ae..b0531d5 100644
---- a/README.rst
-+++ b/README.rst
-@@ -10,7 +10,7 @@ with Python.
-     :Homepage: http://icalendar.readthedocs.org
-     :Code: http://github.com/collective/icalendar
-     :Mailing list: http://github.com/collective/icalendar/issues
--    :Dependencies: `setuptools`_ and since version 3.0 we depend on `pytz`_.
-+    :Dependencies: `python-dateutil`_ and `pytz`_.
-     :Compatible with: Python 2.6, 2.7 and 3.3+
-     :License: `BSD`_
-
-@@ -72,8 +72,8 @@ a suggestion to icalendar-dev@codespeak.net to take over maintaining of
- .. _`icalendar`: http://pypi.python.org/pypi/icalendar
- .. _`plone.app.event`: http://github.com/plone/plone.app.event
- .. _`Plone`: http://plone.org
-+.. _`python-dateutil`: https://github.com/dateutil/dateutil/
- .. _`pytz`: http://pypi.python.org/pypi/pytz
--.. _`setuptools`: http://pypi.python.org/pypi/setuptools
- .. _`RFC`: http://www.ietf.org/rfc/rfc5545.txt
- .. _`BSD`: https://github.com/collective/icalendar/issues/2
-
-@@ -96,4 +96,3 @@ Output from coverage test::
-     src/icalendar/tools               16      0   100%
-     --------------------------------------------------
-     TOTAL                           1152     81    93%
--
-diff --git a/setup.py b/setup.py
-index 4efc264..9ea69cb 100644
---- a/setup.py
-+++ b/setup.py
-@@ -22,7 +22,6 @@
- install_requires = [
-     'python-dateutil',
-     'pytz',
--    'setuptools',
- ]
-
- if sys.version_info[:2] == (2, 6):
+D .gitattributes
+
+diff --git a/.gitattributes b/.gitattributes
+deleted file mode 100644
+index 6f9ff67..0000000
+--- a/.gitattributes
++++ /dev/null
+@@ -1 +0,0 @@
+-CHANGES.rst merge=union