Skip to content

Commit 779e3a6

Browse files
committed
Replace sphinxcontrib-newsfeed with sphinxfeed-lsaffre
The former has been unmaintained for many years, and no longer works with recent versions of Sphinx. The generated feed is not _identical_, but has essentially the same content. Fixes: #1455
1 parent 784d8f0 commit 779e3a6

33 files changed

Lines changed: 45 additions & 91 deletions

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ unreleased
1515
* FIX the location of caching database to ``$XDG_CACHE_HOME``
1616
* FIX color of eventcolumn when editing events in ikhal
1717
* FIX added support for ``icalendar>=7.0.0``.
18+
* NEW DEPENDENCY sphinxfeed-lsaffre
19+
* DROPPED DEPENDENCY sphinxcontrib-newsfeed
1820

1921
0.13.0
2022
======

doc/source/conf.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def write_section(specsection, secname, key, comment, output):
106106
'sphinx.ext.autodoc',
107107
'sphinx.ext.intersphinx',
108108
'sphinx.ext.todo',
109-
'sphinxcontrib.newsfeed',
109+
'sphinxfeed',
110110
]
111111

112112
# Add any paths that contain templates here, relative to this directory.
@@ -307,5 +307,15 @@ def write_section(specsection, secname, key, comment, output):
307307
#texinfo_no_detailmenu = False
308308

309309

310+
# sphinxfeed ------------------------------------------------------------------
311+
312+
feed_base_url = 'https://lostpackets.de/khal'
313+
feed_author = 'khal contributors'
314+
feed_description = 'News feed for khal - a standards based calendar program'
315+
feed_filename = 'index.rss'
316+
feed_field_name = 'date'
317+
318+
# intersphinx -----------------------------------------------------------------
319+
310320
# Example configuration for intersphinx: refer to the Python standard library.
311321
intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}

doc/source/hacking.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ Documentation
139139
*************
140140
Khal's documentation, which is living in :file:`doc`, is using sphinx_ to
141141
generate the html documentation as well as the man page from the same sources.
142-
After install `sphinx` and `sphinxcontrib-newsfeed` you should be able to build
142+
After install `sphinx` and `sphinxfeed-lsaffre` you should be able to build
143143
the documentation with :command:`make html` and :command:`make man` respectively
144144
from the root of the :file:`doc` directory (note that this requires `GNU make`,
145145
so on some system running :command:`gmake` may be required).

doc/source/news.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ available as an `rss feed <https://lostpackets.de/khal/index.rss>`_ |rss|.
77
.. |rss| image:: images/rss.png
88
:target: https://lostpackets.de/khal/index.rss
99

10-
.. feed::
11-
:rss: index.rss
12-
:title: khal news
13-
:link: http://lostpackets.de/khal/
10+
.. toctree::
11+
:hidden:
1412

1513
news/khal0100
1614
news/khal098

doc/source/news/30c3.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
:date: 2013-12-13
12
pycarddav and khal at 30c3
23
==========================
34

4-
.. feed-entry::
5-
:date: 2013-12-13
6-
75
If you will be 30C3_ and would like to discuss the faults and merits of khal or
86
pycarddav, commandline calendaring/addressbooking in general, your ideas or just
97
have a beer or mate, I'd love to meet up. You can find my contact details under

doc/source/news/31c3.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
:date: 2014-12-09
12
pycarddav and khal at 31c3
23
==========================
34

4-
.. feed-entry::
5-
:date: 2014-12-09
6-
75
If you will be at 31C3_ and would like to discuss the faults and merits of khal
86
or pycarddav, commandline calendaring/addressbooking in general, your ideas or
97
just have a beer or mate, I'd love to meet up. You can find my contact details

doc/source/news/callfortesting.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
:date: 2013-11-19
12
Call for Testing
23
=================
34

4-
.. feed-entry::
5-
:date: 2013-11-19
6-
75
While there isn't a release yet, *khal* is, at least partly, in a usable shape
86
by now. Please report any errors you stumble upon and improvement suggestions
97
you have either via email or github_ (if you don't have any privacy concerns

doc/source/news/khal01.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
:date: 2014-04-03
12
khal v0.1 released
23
==================
34

4-
.. feed-entry::
5-
:date: 2014-04-03
6-
75
The first release of khal is here: `khal v0.1.0`__ (and also available on pypi_
86
now).
97

doc/source/news/khal0100.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
:date: 2019-03-25
12
khal v0.10.0 released
23
=====================
34

4-
.. feed-entry::
5-
:date: 2019-03-25
6-
75
This is not only the first bugfix release in more than a year, but also the
86
first release containing new features in nearly two years.
97

doc/source/news/khal011.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
:date: 2014-05-07
12
khal v0.1.1 released
23
====================
34

4-
.. feed-entry::
5-
:date: 2014-05-07
6-
75
A small bugfix release: `khal v0.1.0`__
86
Example config file now in source dist.
97

0 commit comments

Comments
 (0)