Merge pull request #48 from al4/master

Orlo 0.4.0

.gitignore

@@ -24,6 +24,10 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+debian/*.debhelper
+debian/*.substvars
+debian/orlo
+debian/files
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

.travis.yml

@@ -1,4 +1,5 @@
 language: python
+dist: trusty
 
 notifications:
   slack: ebayclassifiedsgroup:lH5V2FnojyNCh8X84Qi1FKjk
@@ -11,7 +12,7 @@ addons:
   apt:
     packages:
     - curl
-  postgresql: "9.3"
+  postgresql: "9.4"
 
 services:
   - postgresql
@@ -24,4 +25,4 @@ before_install:
   - pip install tox tox-travis
 
 script:
-  - tox -- --maxfail=2
+  - tox -v -- --maxfail=2

MANIFEST.in

@@ -1 +1,2 @@
 include README.md
+recursive-include orlo/migrations *

Makefile

@@ -3,7 +3,7 @@
 # Uses git buildpackage, which from debian rules will call dh_virtualenv
 
 test:
-	python setup.py test
+	tox
 
 sdist:
 	python setup.py sdist
@@ -12,10 +12,10 @@ clean:
 	python setup.py clean
 	debuild clean
 
-debian:
+deb:
 	debuild -us -uc
 
 changelog:
-	gbp dch --ignore-branch --auto --commit
+	gbp dch --ignore-branch --auto --commit debian
 
 .PHONY: debian sdist test clean changelog

Vagrantfile

@@ -13,6 +13,7 @@ Vagrant.configure(2) do |config|
   end
 
   config.vm.provision "shell", inline: <<-SHELL
+    echo 'en_GB.UTF-8 UTF-8' | tee -a /etc/locale.gen
     sudo localedef -i en_GB -f UTF-8 en_GB.UTF-8
     sudo locale-gen en_GB.UTF-8
     sudo sed -i 's/us.archive.ubuntu.com/nl.archive.ubuntu.com/g' /etc/apt/sources.list
@@ -28,6 +29,7 @@ Vagrant.configure(2) do |config|
       dh-systemd \
       git-buildpackage \
       postgresql-client \
+      libpq-dev \
       mysql-client \
       python-all-dev \
       python-dev \
@@ -49,12 +51,8 @@ Vagrant.configure(2) do |config|
       libsasl2-dev \
       libssl-dev \
 
-    # Updating build tooling can help
-    sudo pip install --upgrade \
-      pip \
-      setuptools \
-      stdeb \
-      virtualenv \
+    sudo pip install --upgrade pip setuptools
+    sudo pip install --upgrade stdeb virtualenv
 
     wget -P /tmp/ \
         'http://launchpadlibrarian.net/291737817/dh-virtualenv_1.0-1_all.deb'
@@ -66,36 +64,30 @@ Vagrant.configure(2) do |config|
     source /home/vagrant/virtualenv/orlo/bin/activate
     echo "source ~/virtualenv/orlo/bin/activate" >> /home/vagrant/.profile
 
-    pip install -r /vagrant/orlo/requirements.txt
-    pip install -r /vagrant/orlo/requirements_testing.txt
+    pip install --upgrade pip setuptools
+
+    cd /vagrant/orlo
+    pip install .[test]
     pip install -r /vagrant/orlo/docs/requirements.txt
+    python setup.py develop
 
     mkdir -p /etc/orlo /var/log/orlo
+    # echo -e "[db]\nuri=postgres://orlo:[email protected]" > /etc/orlo/orlo.ini
+
+
     chown -R vagrant:root /etc/orlo /var/log/orlo
     chown -R vagrant:vagrant /home/vagrant/virtualenv
     chown vagrant:root /vagrant
-
-    # Create the database
-    #cd /vagrant/orlo
-    #python create_db.py
-    #python setup.py develop
-
   SHELL
 
   config.vm.define "jessie" do |jessie|
-    jessie.vm.box = "bento/debian-8.6"
+    jessie.vm.box = "bento/debian-8.7"
     jessie.vm.network "forwarded_port", guest: 5000, host: 5000
     jessie.vm.network "private_network", ip: "192.168.57.20"
     jessie.vm.provision "shell", inline: <<-SHELL
     SHELL
   end
 
-#   config.vm.define "trusty" do |trusty|
-#     trusty.vm.box = "bento/ubuntu-14.04"
-#     trusty.vm.network "forwarded_port", guest: 5000, host: 5100
-#     trusty.vm.network "private_network", ip: "192.168.57.10"
-#   end
-
   config.vm.define "xenial" do |xenial|
     xenial.vm.box = "bento/ubuntu-16.04"
     xenial.vm.network "forwarded_port", guest: 5000, host: 5200

debian/changelog

@@ -1,3 +1,56 @@
+orlo (0.3.1-3) UNRELEASED; urgency=medium
+
+  [ Alex Forbes ]
+  * Fix exec path
+
+  [ vagrant ]
+
+ -- Alex Forbes <[email protected]>  Thu, 24 Nov 2016 10:09:28 +0000
+
+orlo (0.3.1-2) jessie; urgency=medium
+
+  [ Alex Forbes ]
+  * Fix path to gunicorn in systemd unit
+
+  [ vagrant ]
+
+ -- Alex Forbes <[email protected]>  Wed, 23 Nov 2016 18:02:42 +0000
+
+orlo (0.3.1-1) jessie; urgency=medium
+
+  [ Alex Forbes ]
+  * Fix test
+  * Rename __init__ to test_base and update imports
+  * Create multiple vagrant machines for testing
+  * Add jessie and xenial vagrant boxes for build/testing
+  * Run python setup.py clean in make clean
+  * Change deb install location to /opt/venvs
+  * Add initial tox.ini
+  * Default internal config should be sqlite
+  * Configure tests to use postgres in vagrant
+  * Remove trusty vm, fix IP
+  * Use main repos, upgrade dh-virtualenv, fix missing \
+  * Add db clients and restart postgres
+  * Small doc fix
+  * Remove dependency on passwd file by mocking the verification function
+  * Use tox to run tests in travis
+  * mock has moved under py3
+  * Set test database to localhost if running in Travis
+  * Set posargs for tox and maxfail for pytest
+  * Pass travis env car through to tox
+  * Rename DeployTest as LiveDbTest, move to test_base
+  * Add stress test
+  * Add liveserver config to app, refactor db test with classmethods
+  * Close the session in our json streamer to avoid leaking connections
+  * Test refactor
+  * Fix test failure caused by previous tests not clearing db connection
+  * Bump version to 0.3.1
+  * Fix locale in vagrantfile (for me anyway 😁), use tox for testing
+
+  [ vagrant ]
+
+ -- Alex Forbes <[email protected]>  Wed, 23 Nov 2016 17:39:48 +0000
+
 orlo (0.3.1) trusty; urgency=medium
 
   * Add support for filtering by reference

debian/systemd/orlo.service

@@ -3,13 +3,13 @@
 [Unit]
 Description=orlo
 After=network.target
-ConditionPathExists=/usr/share/python/orlo/bin/gunicorn
+ConditionPathExists=/opt/venvs/orlo/bin/gunicorn
 
 [Service]
 Type=simple
 User=orlo
 Group=orlo
-ExecStart=/usr/share/python/orlo/bin/gunicorn \
+ExecStart=/opt/venvs/orlo/bin/gunicorn \
  -w 4 -b 127.0.0.1:8080 \
  --access-logfile /var/log/orlo/gunicorn-access.log \
  --log-level debug \