Merge pull request #154 from VNG-Realisatie/issue/fix-merge-conflicts

Revert "Merge branch 'master' into stable/1.0.x"
VNG-Realisatie · Oct 19, 2020 · 152af41 · 152af41
2 parents ac9a5e4 + 58ceeb6
commit 152af41
Show file tree

Hide file tree

Showing 62 changed files with 965 additions and 2,100 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,7 +1,7 @@
 [bumpversion]
 commit = False
 tag = False
-current_version = 1.5.6
+current_version = 1.0.52
 
 [bumpversion:file:setup.cfg]
 

diff --git a/.travis.yml b/.travis.yml
@@ -1,27 +1,19 @@
 language: python
 cache: pip
 
-services:
-  - postgresql
+sudo: false
 
 python:
   - "3.6"
-  - "3.7"
 
 env:
-  global:
-    - PGUSER=postgres
-    - PGDATABASE=postgres
-    - PGPASSWORD=
-  matrix:
-    - DJANGO=2.2
+  - DJANGO=2.2
 
 matrix:
   fast_finish: true
   include:
     - { python: "3.6", env: TOXENV=isort }
     - { python: "3.6", env: TOXENV=docs }
-    - { python: "3.6", env: TOXENV=black }
 
 install:
   - pip install tox-travis

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
diff --git a/README.rst b/README.rst
@@ -2,7 +2,7 @@
 VNG-API-common - Tooling voor RESTful APIs
 ==========================================
 
-|build-status| |coverage| |docs| |black|
+|build-status| |coverage| |docs|
 
 |python-versions| |django-versions| |pypi-version|
 
@@ -84,7 +84,4 @@ Features
 .. |pypi-version| image:: https://img.shields.io/pypi/v/vng-api-common.svg
     :target: https://pypi.org/project/vng-api-common/
 
-.. |black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
-
 .. _documentatie: https://vng-api-common.readthedocs.io/en/latest/?badge=latest
diff --git a/docs/conf.py b/docs/conf.py
@@ -23,7 +23,6 @@
 
 settings.configure(
     INSTALLED_APPS=[
-        "django.contrib.sites",
         "rest_framework",
         "django_filters",
         "vng_api_common",

diff --git a/docs/ref/http_caching.rst b/docs/ref/http_caching.rst
diff --git a/docs/ref/index.rst b/docs/ref/index.rst
@@ -13,7 +13,6 @@ Modules reference
    exceptions
    middleware
    viewset-mixins
-   http_caching
    database
    geo
    polymorphism