Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 ChangeLog                          |    4 +++
 python-pypi/django/DEPENDS         |   33 +++++++++++++++++++++++----
 python-pypi/django/DETAILS         |   44 
++++++++++++++++++++++---------------
 python-pypi/django/HISTORY         |    7 +++++
 python-pypi/django/PREPARE         |   19 ++++++++++++---
 python-pypi/mysql-python/CONFLICTS |    1 
 python-pypi/mysql-python/HISTORY   |    3 ++
 python-pypi/mysqlclient/CONFLICTS  |    1 
 python-pypi/mysqlclient/DEPENDS    |    3 ++
 python-pypi/mysqlclient/DETAILS    |   25 +++++++++++++++++++++
 python-pypi/mysqlclient/HISTORY    |    2 +
 11 files changed, 116 insertions(+), 26 deletions(-)

New commits:
commit d0be79816022cc7f55f9b304da31a7583f48a453
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    django: => 1.8.3 (stable), 1.4.21 (legacy) [security]

commit 012c0d8bf31d09a5da342005063a73c322b29c34
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    mysql-python: conflicts with mysqlclient

commit 2fbd5aac5316be688587be57e7686b716730c969
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    mysqlclient: new spell, MySQL database connector for Python (with Python 
3 support)

diff --git a/ChangeLog b/ChangeLog
index e0f85f5..3d61d0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * python-pypi/mysqlclient: new spell, MySQL database connector for
+         Python (with Python 3 support)
+
 2015-08-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * haskell/haskell-test-framework: new spell, framework for running and
          organising tests, with HUnit and QuickCheck support
diff --git a/python-pypi/django/DEPENDS b/python-pypi/django/DEPENDS
index 2bab6e0..b544c56 100755
--- a/python-pypi/django/DEPENDS
+++ b/python-pypi/django/DEPENDS
@@ -1,9 +1,32 @@
-if [[ $DJANGO_SVN == y ]]; then
-  depends subversion
+if [[ $DJANGO_BRANCH == "scm" ]]; then
+  depends git
 fi &&
 
-depends python &&
+if [[ $DJANGO_BRANCH == "legacy" ]]; then
+  depends python &&
 
+  suggest_depends python-markdown "" "" "for Markdown rendering support via 
markdown library" &&
+  suggest_depends docutils "" "" "for reStructuredText rendering support" &&
+  suggest_depends python-textile "" "" "for Textile rendering support" &&
+
+  suggest_depends mysql-python "" "" "for MySQL database support"
+else
+  depends PYTHON &&
+  depends jinja2 &&
+
+  suggest_depends mysqlclient "" "" "for MySQL database support"
+fi &&
+
+depends SETUPTOOLS &&
+
+suggest_depends pysqlite "" "" "for SQLite database support via pysqlite2" &&
 suggest_depends psycopg2 "" "" "for PostgreSQL database support" &&
-suggest_depends mysql-python "" "" "for MySQL database support" &&
-suggest_depends bash-completion "" "" "to install django bash completion"
+
+# alternative to https://github.com/pyca/bcrypt/, which is not in our 
grimoire yet
+suggest_depends py-bcrypt "" "" "for secure password hashing via the bcrypt 
algorithm" &&
+
+suggest_depends pillow "" "" "for image handling support" &&
+suggest_depends pytz "" "" "for timezone helper functions" &&
+suggest_depends pyyaml "" "" "for YAML serializer support" &&
+
+suggest_depends bash-completion "" "" "to install bash completion for Django"
diff --git a/python-pypi/django/DETAILS b/python-pypi/django/DETAILS
index 2813784..ebe8d37 100755
--- a/python-pypi/django/DETAILS
+++ b/python-pypi/django/DETAILS
@@ -1,23 +1,33 @@
+. "$GRIMOIRE/FUNCTIONS"
+
            SPELL=django
-if [[ $DJANGO_SVN == y ]]; then
-    if [[ $DJANGO_SVN_AUTOUPDATE == y ]]; then
-        VERSION=$(date +%Y%m%d)
-    else
-        VERSION=svn
-    fi
-          SOURCE=$SPELL-svn.tar.bz2
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-svn"
-   SOURCE_URL[0]=svn_http://code.djangoproject.com/svn/django/trunk:$SPELL
+          SPELLX=Django
+case "$DJANGO_BRANCH" in
+  scm)
+         VERSION=$(get_scm_version)
+          SOURCE=${SPELLX}-scm.tar.bz2
+   SOURCE_URL[0]=https://github.com/django/django.git:${SPELLX}-scm
    SOURCE_IGNORE=volatile
   FORCE_DOWNLOAD=on
-else
-         VERSION=1.4.11
-  SECURITY_PATCH=5
-          SOURCE=Django-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/Django-$VERSION"
-   SOURCE_URL[0]=http://www.djangoproject.com/download/$VERSION/tarball/
-     
SOURCE_HASH=sha512:60cc3c769a9b21e93e6c4e79132ab8f4a48df1cb1c55faaa547c5fd28b9785ddca3b5393790bf96a4715d9b708c6da376ef4a28ec14849147d63f0fe40d386cb
-fi
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-scm"
+  ;;
+  legacy)
+         VERSION=1.4.21
+  SECURITY_PATCH=6
+          SOURCE=${SPELLX}-${VERSION}.tar.gz
+   SOURCE_URL[0]=http://www.djangoproject.com/download/${VERSION}/tarball/
+     
SOURCE_HASH=sha512:25fca8362fa30822a5993a2f1d00bc7629b97acfac97daa406fc7658019e35f52ecc539cc875a8ece3b1edb140fd5260e8dd3a355c9405b693d191746df516fa
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+  ;;
+  # stable (also handled for `gaze')
+  stable|*)
+         VERSION=1.8.3
+          SOURCE=${SPELLX}-${VERSION}.tar.gz
+   SOURCE_URL[0]=http://www.djangoproject.com/download/${VERSION}/tarball/
+     
SOURCE_HASH=sha512:17943c4769bb11125ee23cee6e05ce120a769ff46b9b380219bb28a42d4119082c2041fbc826d59707cb9f2cd1dc19c94beb61ac644e8c4fa5ba3bd528efa06e
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+  ;;
+esac
         WEB_SITE=http://www.djangoproject.com/
       LICENSE[0]=BSD
         KEYWORDS="web python devel"
diff --git a/python-pypi/django/HISTORY b/python-pypi/django/HISTORY
index 2643ba0..631700d 100644
--- a/python-pypi/django/HISTORY
+++ b/python-pypi/django/HISTORY
@@ -1,3 +1,10 @@
+2015-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 1.4.21; SECURITY_PATCH++; introduced 
stable
+         branch (added version 1.8.3); svn -> git conversion; use SPELLX
+       * DEPENDS: subversion -> git; added Python 3 support for stable 
branch;
+         added missing deps
+       * PREPARE: backported legacy options for git repository version
+
 2014-04-29 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.4.11; SECURITY_PATCH++
 
diff --git a/python-pypi/django/PREPARE b/python-pypi/django/PREPARE
index a213b20..0df258b 100755
--- a/python-pypi/django/PREPARE
+++ b/python-pypi/django/PREPARE
@@ -1,5 +1,16 @@
-config_query DJANGO_SVN "Build SVN version?" n &&
+. "$GRIMOIRE"/FUNCTIONS &&
 
-if [[ $DJANGO_SVN == y ]]; then
-    config_query DJANGO_SVN_AUTOUPDATE "Update on every system update?" n
-fi
+# backport obsolete settings (also svn -> git)
+if spell_ok $SPELL && [[ $DJANGO_SVN == y ]]; then
+  persistent_add DJANGO_BRANCH &&
+  DJANGO_BRANCH="scm" &&
+  persistent_remove DJANGO_SVN &&
+
+  if [[ $DJANGO_SVN_AUTOUPDATE == y ]]; then
+    persistent_add DJANGO_AUTOUPDATE &&
+    DJANGO_AUTOUPDATE="y" &&
+    persistent_remove DJANGO_SVN_AUTOUPDATE
+  fi
+fi &&
+
+prepare_select_branch stable legacy scm
diff --git a/python-pypi/mysql-python/CONFLICTS 
b/python-pypi/mysql-python/CONFLICTS
new file mode 100755
index 0000000..b5499ad
--- /dev/null
+++ b/python-pypi/mysql-python/CONFLICTS
@@ -0,0 +1 @@
+conflicts mysqlclient
diff --git a/python-pypi/mysql-python/HISTORY 
b/python-pypi/mysql-python/HISTORY
index 823964b..ba41d50 100644
--- a/python-pypi/mysql-python/HISTORY
+++ b/python-pypi/mysql-python/HISTORY
@@ -1,3 +1,6 @@
+2015-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added, conflicts with mysqlclient
+
 2014-11-26 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 1.2.5; fixed source url
        * PRE_BUILD: added, to apply the patch
diff --git a/python-pypi/mysqlclient/CONFLICTS 
b/python-pypi/mysqlclient/CONFLICTS
new file mode 100755
index 0000000..fe578ff
--- /dev/null
+++ b/python-pypi/mysqlclient/CONFLICTS
@@ -0,0 +1 @@
+conflicts mysql-python
diff --git a/python-pypi/mysqlclient/DEPENDS b/python-pypi/mysqlclient/DEPENDS
new file mode 100755
index 0000000..4dd4ed3
--- /dev/null
+++ b/python-pypi/mysqlclient/DEPENDS
@@ -0,0 +1,3 @@
+depends PYTHON &&
+depends MYSQL &&
+depends SETUPTOOLS
diff --git a/python-pypi/mysqlclient/DETAILS b/python-pypi/mysqlclient/DETAILS
new file mode 100755
index 0000000..88329d7
--- /dev/null
+++ b/python-pypi/mysqlclient/DETAILS
@@ -0,0 +1,25 @@
+           SPELL=mysqlclient
+         VERSION=1.3.6
+          SOURCE=${SPELL}-${VERSION}.tar.gz
+   SOURCE_URL[0]=https://pypi.python.org/packages/source/m/${SPELL}/${SOURCE}
+     
SOURCE_HASH=sha512:387f3aef2f913d72fcb08001c70724702bf0af0d6d17be37cba390ffed10e54886f8a9da04cf8f76d3e7e19bd9fb932f0e80142e374703ca97d67d095ad512d1
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+        WEB_SITE=https://github.com/PyMySQL/mysqlclient-python
+         ENTERED=20150805
+      LICENSE[0]=GPL
+        KEYWORDS="mysql python devel"
+           SHORT="MySQL database connector for Python (with Python 3 
support)"
+cat << EOF
+mysqlclient is a fork of MySQL-python. It adds Python 3.3 support and merges
+some pull requests.
+
+MySQLdb is an interface to the popular MySQL database server for Python.
+
+The design goals are:
+
+* Compliance with Python database API version 2.0 PEP-0249[0]
+* Thread-safety
+* Thread-friendliness (threads will not block each other)
+
+[0] https://www.python.org/dev/peps/pep-0249/
+EOF
diff --git a/python-pypi/mysqlclient/HISTORY b/python-pypi/mysqlclient/HISTORY
new file mode 100644
index 0000000..1c8ee56
--- /dev/null
+++ b/python-pypi/mysqlclient/HISTORY
@@ -0,0 +1,2 @@
+2015-08-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS, DEPENDS, CONFLICTS: created spell, version 1.3.6