You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/01/09 20:52:13 UTC
[6/6] git commit: [#4647] move html2text from requirements.txt to
requirements-optional.txt
Updated Branches:
refs/heads/master 57aa6253e -> ad2be6d16
[#4647] move html2text from requirements.txt to requirements-optional.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/ad2be6d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ad2be6d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ad2be6d1
Branch: refs/heads/master
Commit: ad2be6d16af7b23ab09db70dd0f26cecebc163b9
Parents: 75dc752
Author: Dave Brondsema <db...@geek.net>
Authored: Wed Jan 9 19:43:45 2013 +0000
Committer: Dave Brondsema <db...@geek.net>
Committed: Wed Jan 9 19:47:12 2013 +0000
----------------------------------------------------------------------
requirements-optional.txt | 7 +++++++
requirements.txt | 6 ------
2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ad2be6d1/requirements-optional.txt
----------------------------------------------------------------------
diff --git a/requirements-optional.txt b/requirements-optional.txt
index 2730b42..59653df 100644
--- a/requirements-optional.txt
+++ b/requirements-optional.txt
@@ -1,6 +1,13 @@
# Some packages must be optional due to license incompatibility with Apache
# License v2
+# for ForgeWiki mediawiki importer, as well as ForgeBlog external feed
+# importer
+# Use the bleeding edge since stable release 3.200.3 doesn't have
+# https://github.com/aaronsw/html2text/commit/a5c0f3317edd1c9b61f89539b6a6e8363cf99225
+# or many other escaping/formatting improvements
+-e git://github.com/brondsem/html2text.git#egg=html2text # GPL
+
# for ForgeWiki's mediawiki importer:
-e git://github.com/zikzakmedia/python-mediawiki.git#egg=python-mediawiki # GPL
MySQL-python # GPL
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ad2be6d1/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 6b7a5fc..e361bb0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,4 @@
# requirements for local development, or other deployment instances
-# note: this is a GPL library
-# use the bleeding edge since stable release 3.200.3 doesn't have
-# https://github.com/aaronsw/html2text/commit/a5c0f3317edd1c9b61f89539b6a6e8363cf99225
-# or many other escaping/formatting improvements
--e git://github.com/brondsem/html2text.git#egg=html2text
-
# Include our common requirements
-r requirements-common.txt