Merge branch 'feature/remove-importers' into develop

Fantomas42 · Jan 15, 2015 · 76b72a1 · 76b72a1
2 parents 6ea7719 + a4fa8ff
commit 76b72a1
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 1,055 deletions.
diff --git a/buildout.cfg b/buildout.cfg
@@ -10,7 +10,6 @@ develop                 = .
 eggs                    = ${eggs:django}
                           ${eggs:zinnia}
                           ${eggs:markups}
-                          ${eggs:third-party}
 show-picked-versions    = true
 
 [eggs]
@@ -27,8 +26,6 @@ zinnia                  = beautifulsoup4
 markups                 = docutils
                           markdown
                           textile
-third-party             = feedparser
-                          gdata
 
 [demo]
 recipe                  = djangorecipe

diff --git a/docs/how-to/import_export.rst b/docs/how-to/import_export.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -40,7 +40,6 @@ HOW-TOs
    how-to/customize_look_and_feel
    how-to/extending_entry_model
    how-to/rewriting_entry_url
-   how-to/import_export
 
 Development
 -----------
@@ -91,4 +90,3 @@ index or try to find it using the search function:
 .. _`documentation online at readthedocs.org`: http://docs.django-blog-zinnia.com/
 .. _`Build status`: https://travis-ci.org/Fantomas42/django-blog-zinnia
 .. _`Coverage report`: https://coveralls.io/r/Fantomas42/django-blog-zinnia
-
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,10 +1,8 @@
-pillow==2.6.1
-django==1.7.1
+pillow==2.7.0
+django==1.7.3
 django-mptt==0.6.1
 django-tagging==0.3.4
 django-xmlrpc==0.1.5
 beautifulsoup4==4.3.2
-feedparser==5.1.3
-gdata==2.0.18
 pyparsing==2.0.3
 django-contrib-comments==1.5
diff --git a/docs/topics/ecosystem.rst b/docs/topics/ecosystem.rst
@@ -152,6 +152,27 @@ Zinnia-twitter is an admin extension allowing you to post your entries on
 
 URL: https://github.com/django-blog-zinnia/zinnia-twitter
 
+wordpress2zinnia
+================
+
+Migrate your Wordpress blog into Zinnia.
+
+URL: https://github.com/django-blog-zinnia/wordpress2zinnia
+
+blogger2zinnia
+==============
+
+Migrate your Blogger blog into Zinnia.
+
+URL: https://github.com/django-blog-zinnia/blogger2zinnia
+
+feed2zinnia
+===========
+
+Import RSS or Atom feeds into Zinnia.
+
+URL: https://github.com/django-blog-zinnia/feed2zinnia
+
 byteflow2zinnia
 ===============
 

diff --git a/travis.cfg b/travis.cfg
@@ -3,7 +3,6 @@ extends                 = buildout.cfg
 parts                   = test
                           flake8
                           coveralls
-eggs                   -= {eggs:third-party}
 
 [test]
 eggs                   -= nose-progressive

diff --git a/versions.cfg b/versions.cfg
@@ -5,17 +5,15 @@ blessings                       = 1.6
 buildout-versions-checker       = 1.5.1
 collective.recipe.sphinxbuilder = 0.8.2
 coverage                        = 3.7.1
-django                          = 1.7.2
+django                          = 1.7.3
 django-contrib-comments         = 1.5
 django-mptt                     = 0.6.1
 django-tagging                  = 0.3.4
 django-xmlrpc                   = 0.1.5
 djangorecipe                    = 1.11
 docutils                        = 0.12
-feedparser                      = 5.1.3
 flake8                          = 2.3.0
 futures                         = 2.2.0
-gdata                           = 2.0.18
 jinja2                          = 2.7.3
 markdown                        = 2.5.2
 markupsafe                      = 0.23