Mercurial Mercurial > hdabo / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 40322719719f4c59b38b332a714d63cc275bfc9a
authorrougeronj
Fri, 20 Feb 2015 16:58:50 +0100
changeset 455 c122bc2c6f7e
parent 454 9537d125f743 (current diff)
parent 453 40322719719f (diff)
child 456 68c81f692fca
Merge with 40322719719f4c59b38b332a714d63cc275bfc9a
virtualenv/res/src/Django-1.6.8.tar.gz file | annotate | diff | comparison | revisions 
--- a/.hgtags	Fri Feb 20 16:58:05 2015 +0100
+++ b/.hgtags	Fri Feb 20 16:58:50 2015 +0100
@@ -85,3 +85,8 @@
 19d1264a8974d63e30fdcf024c3085fb4307db5c V03.00-alpha.06
 c601e79e9774a451ac2dac74af2bec6f321bcf22 V03.00-alpha.07
 cb6ca4772e2b4d71f6f5092d2f9d657348fe4fab V03.00-alpha.08
+88b5e6785d47af05a9d562fd02126dc6adb23786 V03.00-alpha.09
+88b5e6785d47af05a9d562fd02126dc6adb23786 V03.00-alpha.09
+5bf2dffe3685f7a41b0c886605b18c179277dff0 V03.00-alpha.09
+5bf2dffe3685f7a41b0c886605b18c179277dff0 V03.00-alpha.09
+a634526a90bcaced0638ec87074df42a3778c078 V03.00-alpha.09
--- a/src/hdalab/__init__.py	Fri Feb 20 16:58:05 2015 +0100
+++ b/src/hdalab/__init__.py	Fri Feb 20 16:58:50 2015 +0100
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-VERSION = (3, 0, 0, "alpha", 8)
+VERSION = (3, 0, 0, "alpha", 9)
 
 
 def get_version():
--- a/src/hdalab/templates/renkan_edit.html	Fri Feb 20 16:58:05 2015 +0100
+++ b/src/hdalab/templates/renkan_edit.html	Fri Feb 20 16:58:50 2015 +0100
@@ -35,14 +35,15 @@
            	function startRenkan(){
                 var _renkan = new Rkns.Renkan({
                     manual_save: true,
-                	user_color_editable: false,
-                	user_name_editable: false,
-                	show_user_color: false,
-                	{% if user.is_authenticated %}
-                	user_id:"{{ user.id }}",
-                	user_name:"{{ user }}",
-                	{% endif %}
+                    user_color_editable: false,
+                    user_name_editable: false,
+                    show_user_color: false,
+                    {% if user.is_authenticated %}
+                    user_id:"{{ user.id }}",
+                    user_name:"{{ user }}",
+                    {% endif %}
                     static_url : "{% static 'renkanmanager/lib/renkan/' %}",
+                    allow_image_upload : false,
                     search: [
                         {
                             type: "HdaTags",
--- a/src/requirement.txt	Fri Feb 20 16:58:05 2015 +0100
+++ b/src/requirement.txt	Fri Feb 20 16:58:50 2015 +0100
@@ -1,1 +1,1 @@
-renkanmanager (==0.8.2)
+renkanmanager (==0.8.3)
--- a/virtualenv/res/lib/lib_create_env.py	Fri Feb 20 16:58:05 2015 +0100
+++ b/virtualenv/res/lib/lib_create_env.py	Fri Feb 20 16:58:50 2015 +0100
@@ -216,7 +216,12 @@
 install_raptor2 = gen_install_comp_lib('raptor2', 'RAPTOR2', [], redland_base_env)
 install_rasqal = gen_install_comp_lib('rasqal', "RASQAL", [], redland_base_env)
 install_redland = gen_install_comp_lib('redland', 'REDLAND', [], dict(redland_base_env.items() + {'CFLAGS':'-I%(home_dir)s/include'}.items()))
-install_redland_bindings = gen_install_comp_lib('redland-bindings', "REDLAND_BINDINGS", ['--with-python=%(home_dir)s/bin/python', '--with-python-ldflags=-L'+os.path.abspath(os.path.join(os.path.dirname(os.__file__),'..'))+' -lpython'+".".join(map(str,sys.version_info[0:2]))+' -Wl,-dylib'], redland_base_env)
+python_ld_flags = '-L'+os.path.abspath(os.path.join(os.path.dirname(os.__file__),'..'))+' -lpython'+".".join(map(str,sys.version_info[0:2]))
+if sys.platform == 'darwin':
+    python_ld_flags += ' -Wl,-dylib'
+elif 'linux' in sys.platform:
+    python_ld_flags += ' -nostartfiles -Wl,-shared'
+install_redland_bindings = gen_install_comp_lib('redland-bindings', "REDLAND_BINDINGS", ['--with-python=%(home_dir)s/bin/python', '--with-python-ldflags='+python_ld_flags], redland_base_env)
 
 def install_pystemmer(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop):
     print "install PYSTEMMER from " + res_env.URLS['PYSTEMMER'][res_source_key]
Binary file virtualenv/res/src/Django-1.6.10.tar.gz has changed
Binary file virtualenv/res/src/Django-1.6.8.tar.gz has changed
--- a/virtualenv/web/create_python_env.py	Fri Feb 20 16:58:05 2015 +0100
+++ b/virtualenv/web/create_python_env.py	Fri Feb 20 16:58:50 2015 +0100
@@ -2,6 +2,8 @@
 Call this like ``python create_python_env.py``; it will
 refresh the project-boot.py script
 
+WARNING: after activation of the virtualenv i LINUX, please set the LD_LIBRARY_PATH env var to <path_to_venv>/lib
+
 -prerequisite:
 
 - virtualenv
--- a/virtualenv/web/res/requirements.txt	Fri Feb 20 16:58:05 2015 +0100
+++ b/virtualenv/web/res/requirements.txt	Fri Feb 20 16:58:50 2015 +0100
@@ -1,6 +1,6 @@
 #STATIC_DEPS=true LIBXML2_VERSION=2.9.2 LIBXSLT_VERSION=1.1.28 LIBICONV_VERSION=1.14 pip install --no-index -r requirements.txt
 -f ../../res/src
-Django==1.6.8
+Django==1.6.10
 Pillow==2.6.1
 PyYAML==3.11
 SPARQLWrapper==1.6.4
hdabo