merge master into dp4

Signed-off-by: Darren <git@darrennathanael.com>

.github/workflows/building.yml

@@ -0,0 +1,25 @@
+name: Python CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.6, 3.7, 3.8]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install tox-travis coverage codacy-coverage
+      - name: Test with tox
+        run: |
+          tox

.github/workflows/dockerimage.yml

@@ -0,0 +1,26 @@
+name: Docker Image CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        name: Check out code
+
+      - uses: mr-smithers-excellent/docker-build-push@v5
+        name: Build & push Docker image
+        with:
+          image: darrenofficial/dpaste
+          registry: docker.io
+          tags: latest
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}

.python-version

@@ -0,0 +1,4 @@
+3.8.0
+3.7.5
+3.6.9
+3.5.8

README.md

@@ -0,0 +1,23 @@
+Dpaste
+---
+![dpaste image](https://img.shields.io/pypi/v/dpaste.svg)
+![building](https://travis-ci.org/bartTC/dpaste.svg?branch=master)
+![Code Quality](https://api.codacy.com/project/badge/Grade/185cfbe9b4b447e59a40f816c4a5ebf4)
+
+----
+
+📖 Full documentation on [https://docs.dpaste.org](https://docs.dpaste.org)
+
+
+dpaste is a [pastebin](https://en.wikipedia.org/wiki/Pastebin) application written in [Python](https://www.python.org/) using the [Django](https://www.djangoproject.com/) framework. You can find a live installation on [dpaste.org.](https://dpaste.org)
+
+The project is intended to run standalone as any regular Django Project, but it's also possible to install it into an existing project as a typical Django application.
+
+
+The code is open source and available on Github: [https://github.com/darrenofficial/dpaste](https://github.com/darrenofficial/dpaste). If you found bugs, have problems or ideas with the project or the website installation, please create an *Issue* there.
+
+⚠️ dpaste requires at a minimum Python 3.6 and Django 2.2.
+
+
+dpaste.org: https://dpaste.org/
+pastebin: https://en.wikipedia.org/wiki/Pastebin

README.rst

@@ -1,39 +0,0 @@
-======
-dpaste
-======
-
-.. image:: https://img.shields.io/pypi/v/dpaste.svg
-   :target: https://pypi.org/project/dpaste/
-
-.. image:: https://travis-ci.org/bartTC/dpaste.svg?branch=master
-   :target: https://travis-ci.org/bartTC/dpaste
-
-.. image:: https://api.codacy.com/project/badge/Coverage/185cfbe9b4b447e59a40f816c4a5ebf4
-   :target: https://www.codacy.com/app/bartTC/dpaste
-
-.. image:: https://api.codacy.com/project/badge/Grade/185cfbe9b4b447e59a40f816c4a5ebf4
-   :target: https://www.codacy.com/app/bartTC/dpaste
-
-----
-
-📖 Full documentation on https://dpaste.readthedocs.io/
-
-dpaste is a pastebin_ application written in Python using the Django
-framework. You can find a live installation on `dpaste.de`_.
-
-.. image:: https://raw.githubusercontent.com/bartTC/dpaste/master/docs/_static/dpaste_de_screenshot.png
-   :alt: A screenshot of https://dpaste.de/
-   :width: 60%
-
-The project is intended to run standalone as any regular Django Project,
-but it's also possible to install it into an existing project as a typical
-Django application.
-
-The code is open source and available on Github: https://github.com/bartTC/dpaste.
-If you found bugs, have problems or ideas with the project or the website installation,
-please create an *Issue* there.
-
-⚠️ dpaste requires at a minimum Python 3.6 and Django 2.2.
-
-.. _dpaste.de: https://dpaste.de/
-.. _pastebin: https://en.wikipedia.org/wiki/Pastebin

docker-compose.yml

@@ -34,9 +34,6 @@ services:
       - data_db:/db
     ports:
       - "8000:8000"
-    command: mkdir -p dpaste/static
-    command: make css
-    command: make js
     command: ./manage.py runserver 0:8000
 
   migration:
@@ -46,7 +43,6 @@ services:
       - .:/app:delegated
       - data_db:/db
 
-
 volumes:
   data_db:
   data_collectstatic:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dpaste",
-  "version": "4.0.0",
+  "version": "3.0.0",
   "repository": "https://github.com/bartTC/dpaste",
   "license": "MIT",
   "dependencies": {

renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}