Skip to content

Commit

Permalink
Update Django, remove yarn from travis CI
Browse files Browse the repository at this point in the history
  • Loading branch information
keeganland committed Jun 4, 2020
1 parent 2eb6df3 commit 20d7a78
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion dispatch/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '1.0.1'
__version__ = '1.0.2'


2 changes: 1 addition & 1 deletion dispatch/static/manager/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions dispatch/static/manager/package.json
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
"homepage": "https://www.ubyssey.ca",
Expand Down Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion dispatch/static/manager/src/js/components/Header/Header.js
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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',
Expand All @@ -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',
Expand Down

0 comments on commit 20d7a78

Please sign in to comment.