Dependency updates and cleanup.

DarrenOfficial · Jan 8, 2020 · 02a6812 · 02a6812
1 parent c8c769c
commit 02a6812
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,10 +1,11 @@
 Changelog
 =========
 
-3.5 (master)
-------------
+3.5 (2020-01-08)
+----------------
 
 - Mobile view improvements.
+- Upgraded django-csp dependency to v3.6 that ships with Django 3.0 support.
 
 3.4 (2019-12-08)
 ----------------

diff --git a/Dockerfile b/Dockerfile
@@ -32,7 +32,7 @@ RUN echo "\nℹ️  Building Django project with "${BUILD_EXTRAS}" dependencies.
 WORKDIR /app
 
 # Upgrade pip, the Image one is quite old.
-RUN pip install pip==19.3.1
+RUN pip install -U pip
 
 # Copy the dpaste staticfiles to this image
 COPY --from=staticfiles /app /app/
@@ -43,10 +43,6 @@ COPY setup.py setup.cfg ./
 COPY dpaste/__init__.py dpaste/
 RUN pip install -e .[${BUILD_EXTRAS}]
 
-# Django 3.0 Fix for django-csp, which wasn't released yet
-RUN pip uninstall django-csp -y
-RUN pip install https://github.com/mozilla/django-csp/archive/master.zip
-
 # Copy the rest of the application code
 COPY . .
 

diff --git a/dpaste/__init__.py b/dpaste/__init__.py
@@ -1,4 +1,4 @@
-VERSION = (3, 4)
+VERSION = (3, 5)
 
 __version__ = "{major}.{minor}{rest}".format(
     major=VERSION[0],

diff --git a/setup.cfg b/setup.cfg
@@ -25,17 +25,17 @@ classifiers =
 packages = find:
 include_package_data = True
 zip_safe = False
-python_requires = >=3.5
+python_requires = >=3.6
 install_requires =
     # Essential packages
     django>=2.2
     pygments>=1.6
     django-staticinline>=1.0
-    django-csp>=3.3
-    dj_database_url==0.5.0
+    django-csp>=3.6
+    dj_database_url>=0.5.0
 
     # Additional Lexer
-    jsx-lexer==0.0.8
+    jsx-lexer>=0.0.8
     misaka>=2.1.0
     docutils