Merge pull request #107 from jpadilla/django2

Python 3.7 + Django 2

.isort.cfg

@@ -1,9 +1,11 @@
 [settings]
 atomic=true
 multi_line_output=3
-include_trailing_comma=True
 force_grid_wrap=0
 combine_as_imports=True
 line_length=88
 known_first_party=notaso
-known_third_party=django
+known_third_party = autoslug,braces,configurations,django,django_filters,dotenv,factory,import_export,pytz,rest_framework,rest_framework_swagger
+skip=migrations
+include_trailing_comma=true
+

.pre-commit-config.yaml

@@ -1,15 +1,20 @@
 repos:
 -   repo: https://github.com/ambv/black
-    rev: 18.6b4
+    rev: 18.9b0
     hooks:
     - id: black
 
+-   repo: https://github.com/asottile/seed-isort-config
+    rev: v1.6.0
+    hooks:
+    - id: seed-isort-config
+
 -   repo: https://github.com/pre-commit/mirrors-isort
     rev: v4.3.4
     hooks:
     -   id: isort
 
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v1.4.0
+    rev: v2.1.0
     hooks:
     -   id: flake8

.travis.yml

@@ -1,11 +1,15 @@
 language: python
-python:
-  - "3.6"
+sudo: required
+dist: xenial
+python: "3.7"
 
+services:
+  - docker
 install:
   - pip install black isort flake8
 
 script:
   - black --check .
   - isort --recursive --check-only --diff
   - flake8
+  - ./run-tests.sh

Dockerfile

@@ -1,15 +1,14 @@
-FROM python:2.7-alpine3.7
+FROM python:3.7-alpine3.8
 
 ENV LANG en_US.utf8
 
 # Install build dependencies
 RUN apk add --no-cache --virtual .build-deps build-base
 
 RUN apk add --no-cache \
+  git \
   postgresql-dev \
-  libffi-dev \
-  libxml2-dev \
-  libxslt-dev
+  libffi-dev
 
 RUN pip install pipenv
 

LICENSE

@@ -1,6 +1,6 @@
 All of "Notaso" is licensed under the MIT license.
 
-Copyright (c) 2010-2018 José Padilla
+Copyright (c) 2010-2019 José Padilla
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Pipfile

@@ -4,40 +4,42 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-boto = "==2.49.0"
 cryptography = "~=2.3"
 dj-database-url = "==0.5.0"
-django-allauth = "==0.36.0"
-django-autoslug = "==1.9.3"
+django-allauth = "==0.41.0"
+django-autoslug = "==1.9.6"
 django-braces = "==1.13.0"
-django-configurations = "==2.1"
-django-cors-headers = "==2.4.0"
-django-debug-toolbar = "==1.9.1"
-django-dotenv = "==1.2"
-django-extensions = "==2.1.0"
-django-filter = "==1.1.0"
-django-import-export = "==1.0.1"
+django-configurations = "==2.2"
+django-cors-headers = "==3.2.0"
+django-debug-toolbar = "==2.1"
+django-dotenv = "==1.4.2"
+django-extensions = "==2.2.5"
+django-filter = "==2.2.0"
+django-import-export = "==2.0"
 django-rest-swagger = "==2.2.0"
-django-secure = "==1.0.1"
-django-storages = "==1.1.8"
-djangorestframework = "==3.6.3"
-gunicorn = "==19.9.0"
-lxml = "==3.3.5"
+django-storages = "==1.8"
+djangorestframework = "==3.11.0"
+gunicorn = "==20.0.4"
 memoize = "==1.0.0"
-"psycopg2-binary" = "==2.7.5"
+psycopg2-binary = "==2.8.4"
 pytz = "==2018.5"
-raven = "==6.9.0"
-whitenoise = "==2.0.6"
-Django = "==1.11.15"
+raven = "==6.10.0"
+whitenoise = "==5.0.1"
+Django = "<3"
 Markdown = "==2.6.4"
 MarkupSafe = "==1.0"
-Werkzeug = "==0.9.4"
+Werkzeug = "==0.16.0"
+factory-boy = "==2.12.0"
+boto3 = "==1.10.45"
 
 [dev-packages]
 pre-commit = "*"
+black = "*"
+isort = "*"
+flake8 = "*"
 
 [requires]
-python_version = "2.7"
+python_version = "3.7"
 
 [pipenv]
 allow_prereleases = true