Merge pull request #201 from rambo/test-190

PyUp updates rebased and fixed

Author: rambo

Dockerfile

@@ -1,21 +1,18 @@
-FROM ubuntu:14.04
+FROM ubuntu:16.04
 ENV PYTHONUNBUFFERED 1
 EXPOSE 8000
 
 # Install basics
-RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y build-essential postgresql git python-dev
-RUN apt-get install -y python-virtualenv python3-pip graphviz-dev libpq-dev # faster builds
+RUN apt-get update && apt-get upgrade -y && apt-get install -y curl sudo
+RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash
+RUN apt-get install -y build-essential postgresql \
+    git python-dev python3-dev python-virtualenv \
+    python3-pip python-pip graphviz-dev libpq-dev nodejs
 
 # Install maildump
 EXPOSE 1080
 RUN pip install maildump
 
-# Install nodejs
-RUN apt-get update && apt-get install -y curl
-RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash
-RUN apt-get update && apt-get install -y nodejs
-
 # Create database
 USER postgres
 RUN service postgresql start && \
@@ -46,9 +43,14 @@ ENV LANG en_US.UTF-8
 ENV LANGUAGE en_US:en
 
 # Install python requirements
-RUN virtualenv -p `which python3.4` ../asylum-venv
+RUN virtualenv -p `which python3` ../asylum-venv
 COPY project/requirements /opt/asylum/requirements/
-RUN . ../asylum-venv/bin/activate && pip install packaging appdirs && pip install -r requirements/local.txt && chown -R asylum:asylum ../asylum-venv
+RUN . ../asylum-venv/bin/activate && \
+    pip install pip --upgrade && \
+    pip install packaging appdirs urllib3[secure] && \
+    pip install -r requirements/local.txt && \
+    chown -R asylum:asylum ../asylum-venv && \
+    true
 
 # Configure application
 USER root

README.md

@@ -67,10 +67,10 @@ sudo apt-get install -y nodejs</code></pre>
 
   - `xargs -a <(awk '/^\s*[^#]/' "requirements.apt") -r -- sudo apt-get install` Installs all packages listed in requirements.apt
   - `sudo pip install maildump` currently not python3 compatible due to broken package, only needed if you're going to run in development mode
-  - `` virtualenv -p `which python3.4` venv && source venv/bin/activate ``
+  - `` virtualenv -p `which python3` venv && source venv/bin/activate ``
     - Note: this might not work. If it doesn't, try `virtualenv-3.4`.
       If you don't have `virtualenv-3.4`, you might need to install it (`sudo pip3.4 install virtualenv`).
-      If the installation command fails, you'll have to bootstrap pip for your Python3.4 installation (`wget https://bootstrap.pypa.io/get-pip.py && sudo python3.4 get-pip.py`).
+      If the installation command fails, you'll have to bootstrap pip for your python3 installation (`wget https://bootstrap.pypa.io/get-pip.py && sudo python3 get-pip.py`).
       Good luck.
   - `pip install -r requirements/local.txt` (or `pip install -r requirements/production.txt` if installing on production)
   - Create the postgres database

docker/dev.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -e
-SCRIPTDIR=$(python -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
+SCRIPTDIR=$(python2.7 -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
 
 # Make sure we're in the correct place relative to Dockerfile no matter where we were called from
 cd `dirname "$SCRIPTDIR"`

docker/run_unit_tests.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -e
-SCRIPTDIR=$(python -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
+SCRIPTDIR=$(python2.7 -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
 
 # Make sure we're in the correct place relative to Dockerfile no matter where we were called from
 cd `dirname "$SCRIPTDIR"`

docker/start.sh

@@ -1,5 +1,5 @@
 #!/bin/bash -e
-SCRIPTDIR=$(python -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
+SCRIPTDIR=$(python2.7 -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
 
 # Make sure we're in the correct place relative to Dockerfile no matter where we were called from
 cd `dirname "$SCRIPTDIR"`

docker/test_pull_request.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-SCRIPTDIR=$(python -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
+SCRIPTDIR=$(python2.7 -c 'import os,sys;print os.path.dirname(os.path.realpath(sys.argv[1]))' "$0")
 # Make sure the id is here
 if [ "$1" == "" ]
 then

project/creditor/tests/fixtures/recurring.py

@@ -9,6 +9,10 @@
 
 from .tags import TransactionTagFactory
 
+def get_tag():
+    if TransactionTag.objects.count():
+        return factory.fuzzy.FuzzyChoice(TransactionTag.objects.all())
+    return factory.SubFactory(TransactionTagFactory, label='Membership fee', tmatch='1')
 
 class RecurringTransactionFactory(factory.django.DjangoModelFactory):
 
@@ -19,7 +23,7 @@ class Meta:
     end = None
     rtype = factory.fuzzy.FuzzyChoice(RecurringTransaction.RTYPE_READABLE.keys())
     owner = factory.SubFactory(MemberFactory)  # ternary expression does not really help us since the import is done before the test-db is created, TODO: Make a special helper class that can will evaluate the count later
-    tag = (factory.fuzzy.FuzzyChoice(TransactionTag.objects.all())) if TransactionTag.objects.count() else (factory.SubFactory(TransactionTagFactory, label='Membership fee', tmatch='1'))
+    tag = get_tag
     amount = factory.fuzzy.FuzzyInteger(-40, -10, 5)
     start = factory.LazyAttribute(lambda t: factory.fuzzy.FuzzyDate(t.owner.accepted).fuzz())
 

project/requirements.apt

@@ -1,6 +1,6 @@
 ##basic build dependencies of various Django apps for Ubuntu 14.04
 python-virtualenv
-#build-essential metapackage install: make, gcc, g++, 
+#build-essential metapackage install: make, gcc, g++,
 build-essential
 #required to translate
 gettext
@@ -13,11 +13,11 @@ zlib1g-dev
 
 
 ##Pillow dependencies
-libtiff4-dev
 libjpeg8-dev
 libfreetype6-dev
-liblcms1-dev
 libwebp-dev
+libtiff5-dev
+liblcms2-dev
 
 ##django-extensions
 graphviz-dev

project/requirements/base.txt

@@ -1,43 +1,43 @@
 # Bleeding edge Django
 django==1.8.5
-Jinja2==2.8
-django-jinja==1.4.1
+Jinja2==2.8.1
+django-jinja==2.2.2
 markupsafe==0.23
 
 # Configuration
-django-environ==0.4.0
+django-environ==0.4.1
 django-secure==1.0.1
-whitenoise==2.0.4
+whitenoise==3.2.2
 
 # Forms
-django-braces==1.8.1
-django-crispy-forms==1.5.2
-django-floppyforms==1.5.2
+django-braces==1.10.0
+django-crispy-forms==1.6.1
+django-floppyforms==1.7.0
 
 # Models
-django-model-utils==2.3.1
+django-model-utils==2.6
 
 # Images
-Pillow==3.0.0
+Pillow==3.4.2
 
 # Python-PostgreSQL Database Adapter
-psycopg2==2.6.1
+psycopg2==2.6.2
 
 # Unicode slugification
 git+git://github.com/mozilla/unicode-slugify#egg=unicode-slugify==0.1.3-HEAD
 django-autoslug==1.9.3
 
 # Time zones support
-pytz==2015.6
+pytz==2016.10
 
 # Your custom requirements go here
-django-bootstrap3==6.2.2
+django-bootstrap3==7.1.0
 django-reversion==1.9.3
-djangorestframework==3.3.1
-Markdown==2.6.5
-django-filter==0.11.0
-djangorestframework-filters==0.6.0
+djangorestframework==3.5.3
+Markdown==2.6.7
+django-filter==0.15.3
+djangorestframework-filters==0.9.1
 django-markdown==0.8.4
-django-settings-export==1.0.6
+django-settings-export==1.2.1
 holviapi==0.2.20170129
-python-dateutil==2.4.2
+python-dateutil==2.6.0

project/requirements/local.txt

@@ -1,12 +1,12 @@
 # Local development dependencies go here
 -r base.txt
 
-django-extensions==1.5.7
+django-extensions==1.7.5
 # django-debug-toolbar that works with Django 1.5+
-django-debug-toolbar==1.4
+django-debug-toolbar==1.6
 
 # improved REPL
-ipdb==0.8.1
+ipdb==0.10.1
 
 # the "python3 compatible" package is broken ATM
 # Required by maildump. Need to pin dependency to gevent beta to be Python 3-compatible.
@@ -15,14 +15,14 @@ ipdb==0.8.1
 #maildump==0.5.1
 
 # Code quality
-flake8==2.4.1
-pep8==1.5.7
-pep8-naming==0.3.3
+flake8==3.2.1
+pep8==1.7.0
+pep8-naming==0.4.1
 autopep8==1.3.1
 isort==4.2.5
 
-factory_boy==2.5.2
-pytest==2.8.2
-pytest-django==2.9.1
+factory-boy==2.8.1
+pytest==3.0.5
+pytest-django==3.1.2
 
 loremipsum==1.0.5