Merge pull request #10 from igorkramaric/django-3.1

Django, Postgres & libs update + new travis yml

Author: igorkramaric

.travis.yml

@@ -1,50 +1,27 @@
-
-sudo: false
-dist: xenial
+env:
+  - DJANGO=3.0
+  - DJANGO=3.1.7
 language: python
 python:
-  - "3.6"
   - "3.7"
   - "3.8"
 addons:
-  postgresql: "10"
-env:
-  global:
-    - DJANGO_SETTINGS_MODULE=test_project.settings
-  matrix:
-    - DJANGO=1.9
-    - DJANGO=1.10
-    - DJANGO=1.11
-    - DJANGO=2.0
-    - DJANGO=2.1
-    - DJANGO=3.0
-    - DJANGO=3.0.7
-matrix:
-  exclude:
-    - python: "2.7"
-      env: DJANGO=2.0
-    - python: "2.7"
-      env: DJANGO=2.1
-    - python: "2.7"
-      env: DJANGO=3.0
-    - python: "2.7"
-      env: DJANGO=3.0.7
-    - python: "3.7"
-      env: DJANGO=1.9
-    - python: "3.7"
-      env: DJANGO=1.10
-    - python: "3.7"
-      env: DJANGO=1.11
-    - python: "3.8"
-      env: DJANGO=1.9
-    - python: "3.8"
-      env: DJANGO=1.10
-    - python: "3.8"
-      env: DJANGO=1.11
+  postgresql: '12'
+  apt:
+    packages:
+      - postgresql-12
+      - postgresql-client-12
+before_install:
+  - sudo apt-get update
+  - sudo sed -i 's/port = 5433/port = 5432/' /etc/postgresql/12/main/postgresql.conf
+  - sudo sed -i -e '/local.*peer/s/postgres/all/' -e 's/peer\|md5/trust/g' /etc/postgresql/*/main/pg_hba.conf
+  - sudo service postgresql stop
+  - sudo service postgresql start 12
+  - sleep 1
 install:
   - pip install django==${DJANGO} Pillow psycopg2-binary
   - pip install .
 before_script:
   - psql -c 'create database test_jsonate;' -U postgres
-
+  - psql test_jsonate -c 'CREATE EXTENSION IF NOT EXISTS hstore;' -U postgres
 script: python test_project/manage.py test test_app

requirements.txt

@@ -1,3 +1,3 @@
-psycopg2-binary==2.8.4
-django==3.0.4
-pillow==7.0.0
+psycopg2-binary==2.8.6
+django==3.1.7
+pillow==7.1.1

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name='jsonate',
-    version='0.7.0',
+    version='0.7.1',
 
     author='James Robert',
     author_email='jiaaro@gmail.com',
@@ -17,7 +17,7 @@
     url='http://jsonate.com',
 
     install_requires=[
-        "django>=2.0",
+        "django>=3.0",
     ],
 
     packages=[