499 Commits

Author SHA1 Message Date
Frank Hamand
1161d5df01 Re-add sqlalchemy requirement - it's still used for test result backend 2017-02-16 14:40:02 +00:00
Frank Hamand
2806128a19 Refactor clean_db task and add check for infinite cleaning loop 2017-02-16 14:36:54 +00:00
Jannis Leidel
9ccc9175c9
Added missing default for environ_get_list 2017-02-16 13:59:08 +01:00
Jannis Leidel
5c9de8236e
Minor cosmetic change in settings. 2017-02-16 13:59:08 +01:00
Jannis Leidel
326cf5d548
Support CACHE_URL for the Celery broker as well. 2017-02-16 13:59:08 +01:00
Jannis Leidel
a961f9621e
Drop django-smtp-ssl in favor of Django's native feature 2017-02-16 13:59:01 +01:00
Frank Hamand
30df15d19a Add another cleanup test and fix celery test broker
Turns out celery doesn't like in-memory sql backends, but has a
built-in memory broker. Use that instead and remove sqlalchemy
requirement
2017-02-16 12:56:20 +00:00
Frank Hamand
9f61f9e621 Fix all django warnings
Mainly involved updating django-compressor and related changes
2017-02-16 12:43:38 +00:00
Frank Hamand
9388274b84 Merge pull request #423 from arachnys/alpine-docker
Switch to using alpine linux for docker container
2017-02-16 12:42:23 +00:00
Frank Hamand
86b41dcfd1 Add comment for wait_for_migrations hack 2017-02-16 12:00:17 +00:00
Frank Hamand
f59d02926a Move sqlalchemy to requirements-dev.txt
It's only used for tests (to use sqlite as celery queue)
2017-02-16 11:58:11 +00:00
Frank Hamand
da2cbe85c0 Remove docker-compose-production.yml
I think this should be moved to a separate repository
2017-02-13 14:48:07 +00:00
Frank Hamand
06716e9837 Update travis.yml to use docker-compose-test.yml 2017-02-13 14:48:07 +00:00
Frank Hamand
fd5f0d6b48 Update CHANGES 2017-02-13 14:48:07 +00:00
Frank Hamand
bc1b8b79d7 Fix db cleanup test
The test wasn't running with CELERY_ALWAYS_EAGER so the clean task
wasn't re-running itself to cleanup the other result
2017-02-13 14:48:07 +00:00
Frank Hamand
ec5f6825e2 Add default.env and test.env and multiple docker-compose files to override settings 2017-02-13 14:48:07 +00:00
Frank Hamand
2f79bc5a23 Switch to using alpine linux for docker container 2017-02-13 14:08:24 +00:00
Frank Hamand
5c43b2a744 Merge pull request #424 from arachnys/fix-database-cleanup-task
Fix database cleanup task
2017-02-13 14:07:04 +00:00
Frank Hamand
6c0c5d0577 Update CHANGES 2017-02-13 14:01:23 +00:00
Frank Hamand
1dae33d665 Refactor clean db task 2017-02-13 13:52:12 +00:00
Frank Hamand
4a3d2155fe Add tests 2017-02-12 12:05:00 +00:00
Frank Hamand
3992f9e863 Fix database cleanup task
The task was failing for 2 reasons:

1. It was selecting ALL results, flattening them into a list and only
then truncating to 100. The table has 46 million rows. Fix this by
truncating in the database before flattening to a list.

2. The sql query was very expensive, this is because it was filtering
by *time*, but sorting on *time_complete* (the default ordering)
2017-02-12 11:27:51 +00:00
Frank Hamand
25adc5d9c4 Merge pull request #421 from arachnys/auto-initialise-docker
Auto initialise on docker container start
2017-02-09 18:32:27 +00:00
Frank Hamand
97de1820dd Update CHANGES 2017-02-09 17:58:24 +00:00
Frank Hamand
6ac8eb10ad Silence output from container waits and add timeout 2017-02-09 17:58:06 +00:00
Frank Hamand
3a5e524b04 Automatically initialise database and assets on docker start
Currently the first time you run the server you need to manually
syncdb, create superuser and collect assets. Do this automatically
on container launch
2017-02-09 17:58:06 +00:00
Frank Hamand
1f2f23e8f6 Merge pull request #422 from arachnys/update-plugin-conf
Update CABOT_PLUGINS_ENABLED versions
2017-02-09 17:57:10 +00:00
Frank Hamand
7bec7393d4 Update CABOT_PLUGINS_ENABLED versions 2017-02-09 17:50:00 +00:00
Frank Hamand
e5ecbe10da Merge pull request #420 from arachnys/fix-database-race-condition
Fix docker container race conditions
2017-02-09 16:21:49 +00:00
Frank Hamand
cba2c7787b Update CHANGES 2017-02-09 15:49:56 +00:00
Frank Hamand
daad98130b Fix race condition with docker containers
The web container could start running before the database/celery broker
was launched. Add wait checks in docker-entrypoint
2017-02-09 15:48:30 +00:00
Frank Hamand
71b4fb4dd6 0.8.1 0.8.1 2017-02-09 13:00:55 +00:00
Frank Hamand
e594962cff Merge pull request #419 from arachnys/fix-beat-workers
Fix all workers running beats
2017-02-09 13:00:07 +00:00
Frank Hamand
38f9408b53 Fix MIT license shield
The current URL was failing most of the time. Switch to using the correct MIT shield url
2017-02-09 12:54:48 +00:00
Frank Hamand
8dd27fb82c Fix all workers running beats
This caused inaccurate timings and some duplicate jobs running. There
should only ever be a single beat service, whereas we were using a dev
feature to run a beat service on all 16 workers
2017-02-09 12:19:40 +00:00
Jean-Fred Berthelot
bd877b827d Update wsgi.py config after Django upgrade
Post Django 1.6, one needs to initialize the WSGI app
using `get_wsgi_application`.

Otherwise, `AppRegistryNotReady` gets thrown.
2017-02-07 15:00:39 +00:00
Jean-Fred Berthelot
39081845cd Add Compress operation to Travis-CI
We want to check that `python manage.py compress` works.
2017-02-07 10:31:38 +00:00
Jean-Fred Berthelot
9ac617fcd0 Bump django-compressor to 1.5
django-compressor 1.4 does not support well Django 1.8,
and the `manage.py compress` was failing with
`ImportError: cannot import name template_source_loaders`

We cannot go above 1.5, as starting with 1.6, the unit test
`test_query` in `test_urlprefix.URLPrefixTestCase` fails with
'''
UncompressableFileError: '/test/static/bootstrap/css/bootstrap.css'
isn't accessible via COMPRESS_URL ('/static/') and can't be compressed
'''
2017-02-07 10:31:38 +00:00
Jean-Fred Berthelot
bfd9117118 Fix typo in test_urlprefix.URLPrefixTestCase
`test_query` checks the responses from two API calls,
but the second test had a typo, resulting in checking
the first response again.
2017-02-07 10:31:38 +00:00
Frank Hamand
2b9bef8edc 0.8.0 0.8.0 2017-02-06 12:56:42 +00:00
Frank Hamand
8b73dc638e Merge pull request #412 from arachnys/django-1.8
Update to Django 1.8
2017-02-06 12:55:40 +00:00
Frank Hamand
fe354bb140 Upgrade to Django 1.8 2017-02-06 12:47:37 +00:00
Frank Hamand
5afd50fcf0 Update old django settings
Use the new test runner Discover Runner and no longer specify autocommit
as it's on by default now
2017-02-06 12:46:59 +00:00
Frank Hamand
9a4c723ea0 0.7.0 0.7.0 2017-02-06 12:45:20 +00:00
Frank Hamand
eebb3764fd Merge pull request #411 from frankh/django-1.7-frank
Update to Django 1.7
2017-02-06 12:43:13 +00:00
Frank Hamand
f3a30ea961 Fix problem where database was required during code initialization
alert.update_alert_plugins() is executed when the module is loaded.
During tests the module is loaded before the test database is created
causing problems. I've changed it to the intented affect of refreshing
on View initialisation
2017-02-06 12:40:16 +00:00
Frank Hamand
a2bf8c9a82 Update to Django 1.7
Main changes are to migrations. I started them again from scratch and
then renamed check to status_check (as check is now reserved by django).
The plugins also needed updating to be django 1.7 compatible. (they have
to defined their own migrations if they depend on an app with migrations
now)
2017-02-06 12:40:16 +00:00
Frank Hamand
9db94bd891 Merge pull request #414 from arachnys/start-versioning
Start versioning with 0.6.0
0.6.0
2017-02-06 12:36:43 +00:00
Frank Hamand
512c3ff5e3 Start versioning with 0.6.0
We decided to start versioning at 0.6 to match the django version.
There isn't much reason for this beyond that the next 2 changes will
be django upgrades which will bump the version to 0.7 and 0.8
2017-02-06 12:31:33 +00:00
Frank Hamand
34ba63df7a Update build status image in README
Use travis-ci link instead of shields.io as shields.io is down right now
2017-02-01 16:12:58 +00:00