Commit Graph

205 Commits

Author SHA1 Message Date
Athanasios Voutsadakis
80c2d85508 Instruct pyup to skip cffi==1.11.1 2017-10-04 12:20:21 +01:00
Athanasios Voutsadakis
c362bd06b0 Pin to a specific version of cffi
Version 1.11.1 seems to be
[broken](https://bitbucket.org/cffi/cffi/issues?status=new&status=open)

It's pulled in because of [Flask-bcrypt](https://github.com/alphagov/notifications-api/blob/master/requirements.txt#L4)
which [depends on bcrypt](https://github.com/maxcountryman/flask-bcrypt/blob/master/setup.py#L33) which
[asks for a version of cffi >= 1.1](https://github.com/pyca/bcrypt/blob/master/setup.py#L12)
2017-10-04 10:58:22 +01:00
chrisw
e3661440d6 bumped utils version 2017-09-19 16:13:42 +01:00
chrisw
f49eca5324 Add a non-GOV.UK banner option for email branding
Added an extra name, 'org_banner', for branding types into branding_type table
Added org banner into user model in database
Added checks for new branding type to ensure that the correct data is passed into the dict
Tested new checks in html email options
2017-09-19 14:40:22 +01:00
Chris Hill-Scott
21817aa865 Merge branch 'master' into running-without-six 2017-09-19 09:53:40 +01:00
Rebecca Law
e11b9cd498 Merge pull request #1229 from alphagov/pyup-update-pyjwt-1.5.2-to-1.5.3
Update pyjwt to 1.5.3
2017-09-19 09:21:39 +01:00
Rebecca Law
8323549f6c Merge branch 'master' into pyup-update-sqlalchemy-utils-0.32.14-to-0.32.16 2017-09-19 09:21:09 +01:00
Chris Hill-Scott
a539b3a3bd Remove six dependency
six is used for Python 2/3 compatibility. We never run under Python 2.
2017-09-18 09:36:56 +01:00
Leo Hemsted
1cc90c870c Merge pull request #1256 from alphagov/bump_utils
Bump utils to 21.2.0
2017-09-15 11:33:06 +01:00
Athanasios Voutsadakis
71f459b2d8 Bump utils to 21.2.0
This will stop logging the request, as it is logged by nginx-access logs
2017-09-15 10:58:45 +01:00
Leo Hemsted
cfd51fbbed Merge pull request #1245 from alphagov/bcrypt
upgrade flask-bcrypt to 0.7.1
2017-09-11 16:22:14 +01:00
Leo Hemsted
43bda1ae2c upgrade flask-bcrypt to 0.7.1
this uses bcrypt directly rather than using the wrapper python-bcrypt.
WARNING! You'll need to update your local install by running:

```
pip uninstall python-bcrypt
pip install flask-bcrypt==0.7.1
```
2017-09-11 15:47:10 +01:00
Athanasios Voutsadakis
2492061c63 Bump notifications-utils version to 21.0.0
This removes the PID from the log files
2017-09-08 16:12:47 +01:00
Imdad Ahad
fa6b8302b6 Merge pull request #1228 from alphagov/pyup-update-sqlalchemy-1.1.13-to-1.1.14
Update sqlalchemy to 1.1.14
2017-09-08 14:22:06 +01:00
pyup-bot
b0c8f13199 Update notifications-python-client from 4.3.1 to 4.4.0 2017-09-06 11:17:12 +01:00
pyup-bot
b88d6b0a2b Update pyjwt from 1.5.2 to 1.5.3 2017-09-05 19:47:12 +01:00
pyup-bot
33becb9b72 Update sqlalchemy from 1.1.13 to 1.1.14 2017-09-05 17:38:17 +01:00
pyup-bot
ae4c10d2ad Update sqlalchemy-utils from 0.32.14 to 0.32.16 2017-09-01 10:31:03 +01:00
Chris Hill-Scott
2244ae8ccd Merge pull request #1218 from alphagov/pyup-update-flask-migrate-2.1.0-to-2.1.1
Update flask-migrate to 2.1.1
2017-08-30 15:53:03 +01:00
Chris Hill-Scott
9716172164 Merge pull request #1217 from alphagov/pyup-update-psycopg2-2.7.3-to-2.7.3.1
Update psycopg2 to 2.7.3.1
2017-08-30 15:52:55 +01:00
pyup-bot
04bf566614 Update boto3 from 1.4.6 to 1.4.7 2017-08-29 21:31:56 +01:00
Chris Hill-Scott
d0be79cc4c Remove Swagger specification
This was only ever a spike into what it might look like to document
Notify’s API with Swagger (see
7c3d25a87a).
It’s no longer updated, and only talks about version 1 of the public
API.

Keeping it around now is just a liability, and gives us additional Pyup
upgrades to deal with.
2017-08-29 10:32:37 +01:00
pyup-bot
14cf3a58a2 Update flask-migrate from 2.1.0 to 2.1.1 2017-08-28 23:18:03 +01:00
pyup-bot
fe30942889 Update psycopg2 from 2.7.3 to 2.7.3.1 2017-08-26 14:56:56 +01:00
Leo Hemsted
4e7c19a98f update utils to v20 - log from multiple app.log*.json files
the rotating file handler puts the date on the end, so those old files won't be pushed
2017-08-25 14:38:04 +01:00
Chris Hill-Scott
6848a50ae1 Bump utils to 19.0.4
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/210
- [ ] https://github.com/alphagov/notifications-utils/pull/212
2017-08-25 09:36:43 +01:00
Chris Hill-Scott
ce2c157f8f Bump utils to 19.0.2
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/211
2017-08-24 17:11:46 +01:00
Leo Hemsted
336ee69f02 make pyup ignore flask-bcrypt
pyup is trying to upgrade flask-bcrypt, which causes errors in all subsequent PR builds for #reasons. Lets make pyup ignore flask-bcrypt until we figure out why the upgrade doesn't work
2017-08-24 11:16:21 +01:00
Rebecca Law
5b43c0af79 Merge branch 'master' into bump-utils-19.0.0 2017-08-23 10:56:25 +01:00
Rebecca Law
f84bbf530b Bump utils to 19.0.1
To eliminate flask deprecation warnings.
2017-08-23 10:55:56 +01:00
Leo Hemsted
077a5e62f5 re-introduce flask-marshmallow 2017-08-22 16:15:11 +01:00
Chris Hill-Scott
6d1611ef12 Bump utils to 19.0.0
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/201

https://github.com/alphagov/notifications-utils/compare/18.0.1...19.0.0
2017-08-22 14:43:00 +01:00
Leo Hemsted
c36e50bef1 update dependencies 2017-08-18 17:02:31 +01:00
Katie Smith
2f84e1cc45 Merge pull request #1159 from alphagov/pyup-update-sqlalchemy-utils-0.32.9-to-0.32.14
Update sqlalchemy-utils to 0.32.14
2017-08-16 15:58:06 +01:00
Katie Smith
a4372b901e Merge pull request #1102 from alphagov/pyup-update-psycopg2-2.6.2-to-2.7.3
Update psycopg2 to 2.7.3
2017-08-16 15:57:58 +01:00
Katie Smith
12155fe1a4 Merge pull request #1107 from alphagov/pyup-update-marshmallow-sqlalchemy-0.8.0-to-0.13.1
Update marshmallow-sqlalchemy to 0.13.1
2017-08-16 15:57:49 +01:00
Katie Smith
83c0380c35 Merge pull request #1161 from alphagov/pyup-update-gunicorn-19.6.0-to-19.7.1
Update gunicorn to 19.7.1
2017-08-16 14:10:35 +01:00
pyup-bot
050c94d7d4 Update apispec from 0.14.0 to 0.25.0 2017-08-16 04:45:35 +01:00
Rebecca Law
1b7f3f0238 Merge pull request #1138 from alphagov/pyup-update-flask-migrate-1.3.1-to-2.1.0
Update flask-migrate to 2.1.0
2017-08-10 14:05:48 +01:00
Chris Hill-Scott
0207c186e8 Bump utils to 18.0.1
Brings in:
- [ ] https://github.com/alphagov/notifications-utils/pull/203
2017-08-10 12:04:25 +01:00
Rebecca Law
318d6aeb7b Remove comment 2017-08-10 11:32:16 +01:00
Rebecca Law
d9d100e20b Merge branch 'master' into pyup-update-flask-migrate-1.3.1-to-2.1.0 2017-08-10 11:22:05 +01:00
Rebecca Law
32928db6e7 Merge branch 'master' into pyup-pin-notifications-python-client-4.3.1 2017-08-10 10:25:46 +01:00
Leo Hemsted
e7b13e727a don't capture logs directly from stdout
previously in run_app_paas.sh, we captured stdout from the app and
piped that into the log file. However, this came up with a bunch of
problems, mainly:

* exceptions with stack traces often weren't formatted properly,
  and kibana could not parse them
* celery logs were duplicated - we'd collect both the json logs and
  the human readable stdout logs.

instead, with the updated utils library, we can use that to log json
straight to the appropriate directory directly.
2017-08-09 15:29:39 +01:00
pyup-bot
253441dae3 Update gunicorn from 19.6.0 to 19.7.1 2017-08-09 01:01:27 +01:00
pyup-bot
bbc61df950 Update sqlalchemy-utils from 0.32.9 to 0.32.14 2017-08-09 01:01:20 +01:00
Chris Hill-Scott
84a32180b3 Merge pull request #1113 from alphagov/pyup-update-jsonschema-2.5.1-to-2.6.0
Update jsonschema to 2.6.0
2017-08-07 09:54:35 +01:00
Chris Hill-Scott
73a6faebcb Merge pull request #1105 from alphagov/pyup-update-pyjwt-1.4.2-to-1.5.2
Update pyjwt to 1.5.2
2017-08-07 09:54:27 +01:00
Chris Hill-Scott
5a5518be37 Merge pull request #1149 from alphagov/no-celery-4-u
Stop trying to upgrade us to Celery Pyup
2017-08-07 09:49:25 +01:00
Ken Tsang
3c050af190 Bump version to pick up fix for dashes 2017-08-03 14:52:13 +01:00