Download as
Browse Code »

Commit 39964ebe4efb52cb2fd9ffb1ba800b35fecd4977

Authored by Rodrigo Siqueira de Melo
Committed by Sergio Oliveira
1 parent 515762a1
Exists in master and in 11 other branches Validation_colab_sprint_30, check-port, generic-plugins, header_footer, mezuro-integration, move_out_plugins, plugin_extra_configs, spb-release/3.0, stable, test, trac_indexing

Updated installation script. 

Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
Signed-off-by: Sergio Oliveira <sergio@tracy.com.br>
Showing 5 changed files with 64 additions and 59 deletions   Show diff stats
@@ -7,9 +7,8 @@ env: @@ -7,9 +7,8 @@ env:
7 - DJANGO_VERSION=1.7.3 7 - DJANGO_VERSION=1.7.3
8 8
9 install: 9 install:
10 - - pip install -r requirements_dev.txt  
11 - pip install django==${DJANGO_VERSION} 10 - pip install django==${DJANGO_VERSION}
12 - - pip install -e . 11 + - pip install .
13 - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres 12 - psql -c "CREATE USER colab WITH PASSWORD 'colab' CREATEDB;" -U postgres
14 13
15 before_script: 14 before_script:
requirements.txt
View file @515762a
@@ -1,51 +0,0 @@ @@ -1,51 +0,0 @@
1 -Django>=1.7  
2 -South==1.0.0  
3 -psycopg2==2.5.1  
4 -django-piston==0.2.3  
5 -pytz==2011n  
6 -chardet==1.0.1  
7 -python-dateutil==1.5  
8 -django-cliauth==0.9.1  
9 -django-mobile==0.3.0  
10 -django-haystack==2.1  
11 -pysolr==2.1  
12 -poster==0.8.1  
13 -etiquetando==0.1  
14 -html2text==3.200.3  
15 -django-taggit==0.12.1  
16 -python-memcached==1.53  
17 -django-hitcounter==0.1.1  
18 -Pillow==2.5.1  
19 -django-i18n-model==0.0.7  
20 -django-tastypie==0.11.0  
21 -gunicorn==19.1.0  
22 -eventlet==0.15.2  
23 -PyYAML==3.11  
24 -  
25 -# Deps for sentry client (raven)  
26 -raven==3.5.2  
27 -tornado==3.1.1  
28 -  
29 -# Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9  
30 -django-browserid==0.11  
31 -django-revproxy==0.3.1  
32 -  
33 -# Converse.js (XMPP client)  
34 -django-conversejs==0.3.4  
35 -  
36 -# Feedzilla (planet) and deps  
37 -feedzilla==0.24  
38 -django-common==0.1.51  
39 -feedparser==5.1.3  
40 -lxml==3.2.4  
41 -grab==0.4.13  
42 -transliterate==1.5  
43 -  
44 -# Diazo  
45 -diazo==1.0.5  
46 -  
47 -# Dpaste  
48 -dpaste==2.8  
49 -  
50 -# Mailman 2 REST API  
51 -mailman-api==0.2.9  
requirements_dev.txt
  Diff comments   View file @39964eb
@@ -2,4 +2,3 @@ Whoosh==2.5.7 @@ -2,4 +2,3 @@ Whoosh==2.5.7
2 coverage==3.7.1 2 coverage==3.7.1
3 coveralls==0.5 3 coveralls==0.5
4 flake8==2.3.0 4 flake8==2.3.0
5 --r requirements.txt  
1 1
2 from setuptools import setup, find_packages 2 from setuptools import setup, find_packages
3 -from pip.req import parse_requirements  
4 3
5 -reqs = [str(req.req) for req in parse_requirements('requirements.txt')  
6 - if req.req] 4 +
  5 +REQUIREMENTS = [
  6 + 'Django>=1.7',
  7 + 'South==1.0.0',
  8 + 'psycopg2==2.5.1',
  9 + 'django-piston==0.2.3',
  10 + 'pytz==2011n',
  11 + 'chardet==1.0.1',
  12 + 'python-dateutil==1.5',
  13 + 'django-cliauth==0.9.1',
  14 + 'django-mobile==0.3.0',
  15 + 'django-haystack==2.1',
  16 + 'pysolr==2.1',
  17 + 'poster==0.8.1',
  18 + 'etiquetando==0.1',
  19 + 'html2text==3.200.3',
  20 + 'django-taggit==0.12.1',
  21 + 'python-memcached==1.53',
  22 + 'django-hitcounter==0.1.1',
  23 + 'Pillow==2.5.1',
  24 + 'django-i18n-model==0.0.7',
  25 + 'django-tastypie==0.11.0',
  26 + 'gunicorn==19.1.0',
  27 + 'eventlet==0.15.2',
  28 + 'PyYAML==3.11',
  29 +
  30 + # Deps for sentry client (raven)
  31 + 'raven==3.5.2',
  32 + 'tornado==3.1.1',
  33 +
  34 + # Deps for Single SignOn (SSO) - Replaced with django-browserid==0.9
  35 + 'django-browserid==0.11',
  36 + 'django-revproxy==0.3.1',
  37 +
  38 + # Converse.js (XMPP client)
  39 + 'django-conversejs==0.3.4',
  40 +
  41 + # Feedzilla (planet) and deps
  42 + 'feedzilla==0.24',
  43 + 'django-common==0.1.51',
  44 + 'feedparser==5.1.3',
  45 + 'lxml==3.2.4',
  46 + 'grab==0.4.13',
  47 + 'transliterate==1.5',
  48 +
  49 + # Diazo
  50 + 'diazo==1.0.5',
  51 +
  52 + # Dpaste
  53 + 'dpaste==2.8',
  54 +
  55 + # Mailman 2 REST API
  56 + 'mailman-api==0.2.9',
  57 +]
  58 +
  59 +TEST_REQUIREMENTS = [
  60 + 'Whoosh==2.5.7',
  61 + 'coverage==3.7.1',
  62 + 'coveralls==0.5',
  63 + 'flake8==2.3.0',
  64 +]
7 65
8 66
9 EXCLUDE_FROM_PACKAGES = [] 67 EXCLUDE_FROM_PACKAGES = []
@@ -25,7 +83,8 @@ setup( @@ -25,7 +83,8 @@ setup(
25 ]}, 83 ]},
26 zip_safe=False, 84 zip_safe=False,
27 long_description=open('README.rst').read(), 85 long_description=open('README.rst').read(),
28 - install_requires=reqs, 86 + install_requires=REQUIREMENTS,
  87 + tests_require=TEST_REQUIREMENTS,
29 test_suite="tests.run.run_with_coverage", 88 test_suite="tests.run.run_with_coverage",
30 classifiers=[ 89 classifiers=[
31 'Development Status :: 3 - Alpha', 90 'Development Status :: 3 - Alpha',
vagrant/provision.sh
  Diff comments   View file @39964eb
@@ -24,7 +24,6 @@ for dir in /vagrant/colab /vagrant; do @@ -24,7 +24,6 @@ for dir in /vagrant/colab /vagrant; do
24 break 24 break
25 fi 25 fi
26 done 26 done
27 -pip install -r $basedir/requirements_dev.txt  
28 pip install -e $basedir 27 pip install -e $basedir
29 28
30 if [ ! -s /etc/colab/settings.yaml ]; then 29 if [ ! -s /etc/colab/settings.yaml ]; then