Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ python:
- "2.7"
install:
- npm install
# We don't want changes to package-lock.json to show up as local git
# changes when the Python wheel tag is determined.
- git checkout package-lock.json
- pip install --user tox
script:
- npm test
Expand All @@ -12,12 +15,6 @@ script:
after_script:
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
deploy:
- provider: script
skip_cleanup: true
script: .travis/pu.sh
on:
branch: master
tags: false
- provider: releases
skip_cleanup: true
api_key:
Expand Down
24 changes: 0 additions & 24 deletions .travis/pu.sh

This file was deleted.

Empty file added ccdb5_ui/static/.gitkeep
Empty file.
2 changes: 0 additions & 2 deletions ccdb5_ui/static/ccdb5.min.js

This file was deleted.

1 change: 0 additions & 1 deletion ccdb5_ui/static/ccdb5.min.js.map

This file was deleted.

3 changes: 0 additions & 3 deletions ccdb5_ui/static/main.css

This file was deleted.

1 change: 0 additions & 1 deletion ccdb5_ui/static/main.css.map

This file was deleted.

1 change: 1 addition & 0 deletions frontendbuild.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npm run build
1 change: 0 additions & 1 deletion package-lock.json

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

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"name": "ccdb5-ui",
"version": "1.0.12",
"private": false,
"description": "Consumer Complaint Database UI",
"homepage": "https://www.consumerfinance.gov/",
Expand Down Expand Up @@ -100,8 +99,7 @@
"build": "node scripts/build.js",
"test": "node scripts/test.js --env=jsdom --coverage",
"dev-flow": "node scripts/test.js --env=jsdom --coverage --watch",
"lint": "node scripts/lint.js",
"version": "npm run build && git add -A ccdb5_ui"
"lint": "node scripts/lint.js"
},
"jest": {
"collectCoverageFrom": [
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ def read_file(filename):
setup_requires=['cfgov_setup==1.2', 'setuptools-git-version==1.0.3'],
install_requires=[
'Django>=1.8,<1.12',
]
],
frontend_build_script='frontendbuild.sh'
)