From 20d7a78b1b64411560ad06a9b6f2226d1300e83b Mon Sep 17 00:00:00 2001
From: Keegan Landrigan <keeganland@gmail.com>
Date: Thu, 4 Jun 2020 17:43:22 +0000
Subject: [PATCH] Update Django, remove yarn from travis CI

---
 .travis.yml                                               | 8 ++++----
 dispatch/__init__.py                                      | 2 +-
 dispatch/static/manager/package-lock.json                 | 2 +-
 dispatch/static/manager/package.json                      | 6 +++---
 .../static/manager/src/js/components/Header/Header.js     | 2 +-
 setup.py                                                  | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4cef60dfb..55407eb45 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ jobs:
     node_js: 6.9.5
     install:
     - cd dispatch/static/manager
-    - yarn setup
-    script: yarn build
+    - npm install
+    script: npm run-script build
   - stage: deploy
     language: python
     python: '3.7'
@@ -25,8 +25,8 @@ jobs:
     - nvm use 6.9.5
     install:
     - cd dispatch/static/manager
-    - yarn setup
-    - yarn build
+    - npm install --force
+    - npm run-script build    
     - cd ../../../
     script: python setup.py sdist
     deploy:
diff --git a/dispatch/__init__.py b/dispatch/__init__.py
index d536f294d..904131185 100644
--- a/dispatch/__init__.py
+++ b/dispatch/__init__.py
@@ -1,3 +1,3 @@
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 
diff --git a/dispatch/static/manager/package-lock.json b/dispatch/static/manager/package-lock.json
index b235a468f..cbac83292 100644
--- a/dispatch/static/manager/package-lock.json
+++ b/dispatch/static/manager/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "dispatch",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/dispatch/static/manager/package.json b/dispatch/static/manager/package.json
index 91e4b4d01..b93a98d92 100644
--- a/dispatch/static/manager/package.json
+++ b/dispatch/static/manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dispatch",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "The frontend framework for the Dispatch publishing platform.",
   "author": "Peter Siemens <peterjsiemens@gmail.com>",
   "homepage": "https://www.ubyssey.ca",
@@ -83,8 +83,8 @@
     "url": "https://github.com/ubyssey/dispatch/issues"
   },
   "scripts": {
-    "setup": "yarn install --force",
-    "start": "webpack --watch --config webpack.dev.config.js",
+    "watch": "webpack --watch --config webpack.dev.config.js",
+    "dev": "webpack --config webpack.dev.config.js",
     "build": "webpack -p --config webpack.config.js"
 	}
 }
diff --git a/dispatch/static/manager/src/js/components/Header/Header.js b/dispatch/static/manager/src/js/components/Header/Header.js
index eb4cb5332..3da853852 100644
--- a/dispatch/static/manager/src/js/components/Header/Header.js
+++ b/dispatch/static/manager/src/js/components/Header/Header.js
@@ -43,7 +43,7 @@ class Header extends React.Component {
       <header className='c-header'>
         <nav className='bp3-navbar bp3-dark'>
           <div className='bp3-navbar-group bp3-align-left'>
-            {this.renderLink('/', 'nav-logo', 'selection', 'dispatch', '1.0.1')}
+            {this.renderLink('/', 'nav-logo', 'selection', 'dispatch', '1.0.2')}
             <span className='bp3-navbar-divider' />
             <HeaderButtons goTo={this.props.goTo} />
           </div>
diff --git a/setup.py b/setup.py
index 5eb19812f..450cec518 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 setup(name='dispatch',
-    version='1.0.1',
+    version='1.0.2',
     description='A publishing platform for modern newspapers',
     url='https://github.com/ubyssey/dispatch',
     author='Peter Siemens',
@@ -11,7 +11,7 @@
     scripts=['dispatch/bin/dispatch-admin'],
     include_package_data=True,
     install_requires=[
-        'django == 2.2.10',
+        'django == 3.0.7',
         'djangorestframework == 3.11.0',
         'pillow',
         'requests',