Download as
Browse Code »

Commit 5bbf98b4deddd9a35cb17bd9bf74df0e8cc9e014

Authored by Sergio Oliveira
2 parents d90a83e4 79fc32c6
Exists in master and in 1 other branch remove_plugins

Merge branch 'colab-master'

Showing 3 changed files with 12 additions and 10 deletions   Show diff stats
Makefile
  Diff comments   View file @5bbf98b
1 1 NAME = colab-deps
2   -VERSION = 1.11
  2 +VERSION = 1.11.0
3 3 PREFIX = /usr
4 4 TARGET = $(DESTDIR)$(PREFIX)/lib/colab
5 5 DISTDIR = $(NAME)-$(VERSION)
... ... @@ -9,6 +9,7 @@ TARBALL = dist/$(DISTDIR).tar.gz
9 9 all:
10 10 rm -rf ./build
11 11 virtualenv ./build
  12 + ./build/bin/pip install --no-index --find-links=$(DISTDIR) pip==1.5.6
12 13 ./build/bin/pip install --no-index --find-links=$(DISTDIR) --use-wheel -r requirements.txt
13 14 ./build/bin/pip install --no-index --find-links=$(DISTDIR) --no-deps -r requirements-colab-plugins.txt
14 15 virtualenv --relocatable ./build
... ... @@ -29,7 +30,7 @@ sdist: $(TARBALL)
29 30 $(TARBALL):
30 31 mkdir -p $$(dirname $(TARBALL))
31 32 $(RM) $(TARBALL)
32   - tar caf $(TARBALL) $(SOURCES) $(DISTDIR)
  33 + tar czf $(TARBALL) $(SOURCES) $(DISTDIR)
33 34  
34 35 distclean:
35 36 $(RM) -r $$(dirname $(TARBALL)) src/
... ... @@ -37,5 +38,8 @@ distclean:
37 38  
38 39 downloadtar:
39 40 mkdir -p $(DISTDIR)
  41 + wget https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz -O $(DISTDIR)/pip-1.5.6.tar.gz
  42 + wget https://github.com/colab/colab-noosfero-plugin/archive/v0.1.zip -O $(DISTDIR)/colab-noosfero-plugin-0.1.zip
  43 + wget https://github.com/colab/colab-gitlab-plugin/archive/v0.1.zip -O $(DISTDIR)/colab-gitlab-plugin-0.1.zip
  44 + wget https://softwarepublico.gov.br/gitlab/softwarepublico/colab-spb-plugin/repository/archive.tar.gz?ref=v0.1 -O $(DISTDIR)/colab-spb-plugin-0.1.tar.gz --no-check-certificate
40 45 pip install --download $(DISTDIR) -r requirements.txt
41   - pip install --download $(DISTDIR) -r requirements-colab-plugins.txt --no-deps
... ...
requirements-colab-plugins.txt
  Diff comments   View file @5bbf98b
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 +colab-noosfero-plugin==0.1.0
  2 +colab-gitlab-plugin==0.1.0
  3 +colab-spb-plugin==0.1.0
... ...
requirements.txt
  Diff comments   View file @5bbf98b
... ... @@ -2,8 +2,8 @@ Django==1.7.10
2 2 pytz==2011n
3 3 django-haystack==2.2
4 4 django-hitcounter==0.1.1
5   -celery[redis]==3.1
6   -django-revproxy[diazo]==0.9.5
  5 +celery[redis]==3.1.18
  6 +django-revproxy[diazo]==0.9.7
7 7 Whoosh==2.7.0
8 8  
9 9 # Superarchives deps
... ...