Merge branch 'colab-master' into 'master'

Colab master See merge request !2

Merge branch 'colab-master' into 'master'
Colab master See merge request !2
David Silva
2 parents 01f210be 60acc696
Showing 57 changed files with 31 additions and 39 deletions Show diff stats
Django-1.7.7.tar.gz
Makefile
Paste-1.7.5.1.tar.gz
Pillow-2.5.1.zip
PyYAML-3.11.tar.gz
Pygments-1.6.tar.gz
bottle-0.12.7.tar.gz
chardet-1.0.1.tar.gz
diazo-1.0.5.zip
django-browserid-0.11.tar.gz
django-cliauth-0.9.1.tar.gz
django-common-0.1.51.tar.gz
django-conversejs-0.3.4.tar.gz
django-haystack-2.2.0.tar.gz
django-hitcounter-0.1.1.tar.gz
django-i18n-model-0.0.7.tar.gz
django-mobile-0.3.0.tar.gz
django-mptt-0.6.1.tar.gz
django-piston-0.2.3.tar.gz
django-revproxy-0.9.3.tar.gz
 NAME = colab-deps
-VERSION = 1.10
+VERSION = 1.11
 PREFIX = /usr
 TARGET = $(DESTDIR)$(PREFIX)/lib/colab
@@ -7,13 +7,12 @@ all:
 	rm -rf ./build
 	virtualenv ./build
 	./build/bin/pip install --no-index --find-links=$(CURDIR) -r requirements.txt
-	./build/bin/pip install pip-1.5.6.tar.gz
 	virtualenv --relocatable ./build
 clean:
 	$(RM) -r ./build
-SOURCES = Makefile requirements.txt *.tar.* *.zip
+SOURCES = Makefile requirements.txt *.tar.* *.whl *.zip
 install:
 	mkdir -p $$(dirname $(TARGET))
@@ -34,4 +33,9 @@ $(TARBALL):
 	$(RM) -r $(DISTDIR)
 distclean:
-	$(RM) -r $$(dirname $(TARBALL))
+	$(RM) -r $$(dirname $(TARBALL)) src/
+	$(RM) --verbose *.tar.* *.whl *.zip
+
+downloadtar:
+	pip install --download $(CURDIR) -r requirements.txt
+	pip install --download $(CURDIR) -r requirements-colab-plugins.txt --no-deps
@@ -0,0 +1,5 @@
+-e git+https://github.com/colab/colab-noosfero-plugin.git@v0.1#egg=colab-noofero-plugin
+
+-e git+https://github.com/colab/colab-gitlab-plugin.git@v0.1#egg=colab-gitlab-plugin
+
+-e git+https://gitlab.com/softwarepublico/colab-spb-plugin.git@v0.1#egg=colab-spb-plugin
-Django==1.7.7
-psycopg2==2.5.1
-django-piston==0.2.3
+Django==1.7.10
 pytz==2011n
-chardet==1.0.1
-python-dateutil==1.5
-django-cliauth==0.9.1
-django-mobile==0.3.0
 django-haystack==2.2
-pysolr==2.1
-poster==0.8.1
+django-hitcounter==0.1.1
+celery[redis]==3.1
+django-revproxy[diazo]==0.9.5
+
+# Superarchives deps
+chardet==2.3.0
 etiquetando==0.1
 html2text==3.200.3
 django-taggit==0.12.1
-python-memcached==1.53
-django-hitcounter==0.1.1
-Pillow==2.5.1
-django-i18n-model==0.0.7
-django-tastypie==0.11.0
-gunicorn==19.1.0
-eventlet==0.15.2
-PyYAML==3.11
+requests==2.7.0
 # Deps for sentry client (raven)
 raven==3.5.2
 tornado==3.1.1
-# Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9
-django-browserid==0.11
-django-revproxy==0.9.3
-
-# Converse.js (XMPP client)
-django-conversejs==0.3.4
-
-# Feedzilla (planet) and deps
-feedzilla==0.24
-django-common==0.1.51
-feedparser==5.1.3
-lxml==3.4.4
-grab==0.4.13
-transliterate==1.5
-
-# Diazo
-diazo==1.0.5
-
 # Dpaste
 dpaste==2.8
+
+# SPB deps
+psycopg2==2.6.1
+pysolr==2.1
+python-memcached==1.57
+gunicorn==19.3.0
+eventlet==0.17.4
+
+# Gitlab plugin dependency
+python-dateutil==1.5
1	NAME = colab-deps	1	NAME = colab-deps
2	-VERSION = 1.10	2	+VERSION = 1.11
3	PREFIX = /usr	3	PREFIX = /usr
4	TARGET = $(DESTDIR)$(PREFIX)/lib/colab	4	TARGET = $(DESTDIR)$(PREFIX)/lib/colab
5		5
	@@ -7,13 +7,12 @@ all:		@@ -7,13 +7,12 @@ all:
7	rm -rf ./build	7	rm -rf ./build
8	virtualenv ./build	8	virtualenv ./build
9	./build/bin/pip install --no-index --find-links=$(CURDIR) -r requirements.txt	9	./build/bin/pip install --no-index --find-links=$(CURDIR) -r requirements.txt
10	- ./build/bin/pip install pip-1.5.6.tar.gz
11	virtualenv --relocatable ./build	10	virtualenv --relocatable ./build
12		11
13	clean:	12	clean:
14	$(RM) -r ./build	13	$(RM) -r ./build
15		14
16	-SOURCES = Makefile requirements.txt .tar. *.zip	15	+SOURCES = Makefile requirements.txt .tar. .whl .zip
17		16
18	install:	17	install:
19	mkdir -p $$(dirname $(TARGET))	18	mkdir -p $$(dirname $(TARGET))
	@@ -34,4 +33,9 @@ $(TARBALL):		@@ -34,4 +33,9 @@ $(TARBALL):
34	$(RM) -r $(DISTDIR)	33	$(RM) -r $(DISTDIR)
35		34
36	distclean:	35	distclean:
37	- $(RM) -r $$(dirname $(TARBALL))	36	+ $(RM) -r $$(dirname $(TARBALL)) src/
		37	+ $(RM) --verbose .tar. .whl .zip
		38	+
		39	+downloadtar:
		40	+ pip install --download $(CURDIR) -r requirements.txt
		41	+ pip install --download $(CURDIR) -r requirements-colab-plugins.txt --no-deps
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+-e git+https://github.com/colab/colab-noosfero-plugin.git@v0.1#egg=colab-noofero-plugin
	2	+
	3	+-e git+https://github.com/colab/colab-gitlab-plugin.git@v0.1#egg=colab-gitlab-plugin
	4	+
	5	+-e git+https://gitlab.com/softwarepublico/colab-spb-plugin.git@v0.1#egg=colab-spb-plugin
1	-Django==1.7.7
2	-psycopg2==2.5.1
3	-django-piston==0.2.3	1	+Django==1.7.10
4	pytz==2011n	2	pytz==2011n
5	-chardet==1.0.1
6	-python-dateutil==1.5
7	-django-cliauth==0.9.1
8	-django-mobile==0.3.0
9	django-haystack==2.2	3	django-haystack==2.2
10	-pysolr==2.1
11	-poster==0.8.1	4	+django-hitcounter==0.1.1
		5	+celery[redis]==3.1
		6	+django-revproxy[diazo]==0.9.5
		7	+
		8	+# Superarchives deps
		9	+chardet==2.3.0
12	etiquetando==0.1	10	etiquetando==0.1
13	html2text==3.200.3	11	html2text==3.200.3
14	django-taggit==0.12.1	12	django-taggit==0.12.1
15	-python-memcached==1.53
16	-django-hitcounter==0.1.1
17	-Pillow==2.5.1
18	-django-i18n-model==0.0.7
19	-django-tastypie==0.11.0
20	-gunicorn==19.1.0
21	-eventlet==0.15.2
22	-PyYAML==3.11	13	+requests==2.7.0
23		14
24	# Deps for sentry client (raven)	15	# Deps for sentry client (raven)
25	raven==3.5.2	16	raven==3.5.2
26	tornado==3.1.1	17	tornado==3.1.1
27		18
28	-# Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9
29	-django-browserid==0.11
30	-django-revproxy==0.9.3
31	-
32	-# Converse.js (XMPP client)
33	-django-conversejs==0.3.4
34	-
35	-# Feedzilla (planet) and deps
36	-feedzilla==0.24
37	-django-common==0.1.51
38	-feedparser==5.1.3
39	-lxml==3.4.4
40	-grab==0.4.13
41	-transliterate==1.5
42	-
43	-# Diazo
44	-diazo==1.0.5
45	-
46	# Dpaste	19	# Dpaste
47	dpaste==2.8	20	dpaste==2.8
		21	+
		22	+# SPB deps
		23	+psycopg2==2.6.1
		24	+pysolr==2.1
		25	+python-memcached==1.57
		26	+gunicorn==19.3.0
		27	+eventlet==0.17.4
		28	+
		29	+# Gitlab plugin dependency
		30	+python-dateutil==1.5