Skip to content
This repository has been archived by the owner on Sep 1, 2022. It is now read-only.

[WIP] Try to fix bower dependency #560

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ TEST_MSG?="Starting system tests"
# Logging levels
DOCKER_OPTS?=--log-level warn
PIP_OPTS?=--quiet
BOWER_OPTS?=--quiet
BOWER_OPTS?=--quiet --force

URTH_BOWER_FILES:=$(shell find elements -name bower.json)
URTH_SRC_DIRS:=$(foreach dir, $(URTH_BOWER_FILES), $(shell dirname $(dir)))
Expand All @@ -64,7 +64,7 @@ $(URTH_COMP_LINKS): | node_modules/bower $(URTH_SRC_DIRS)
init: node_modules dev_image

node_modules: package.json
@npm install --quiet
@npm install

node_modules/bower: node_modules

Expand Down
5 changes: 2 additions & 3 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@
],
"private": true,
"dependencies": {
"polymer": "Polymer/polymer#>=1.2.4 <=1.5.0",
"webcomponentsjs": "^0.7.2"
"polymer": "Polymer/polymer#^1"
},
"devDependencies": {
"web-component-tester": "*",
"test-fixture": "PolymerElements/test-fixture#^1.0.0"
"test-fixture": "PolymerElements/test-fixture"
}
}
2 changes: 1 addition & 1 deletion elements/urth-core-bind/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4",
"polymer": "Polymer/polymer#^1",
"iron-ajax": "PolymerElements/iron-ajax#^1.0.4",
"promise-polyfill": "polymerlabs/promise-polyfill#^1.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion elements/urth-core-channel/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-core-dataframe/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-core-function/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-core-import/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4",
"polymer": "Polymer/polymer#^1",
"iron-ajax": "PolymerElements/iron-ajax#^1.0.4",
"promise-polyfill": "polymerlabs/promise-polyfill#^1.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion elements/urth-core-storage/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-core-watch/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-help/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4",
"polymer": "Polymer/polymer#^1",
"paper-icon-button": "PolymerElements/paper-icon-button#^1.0.0",
"iron-icons": "PolymerElements/iron-icons#^1.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion elements/urth-viz-area/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-viz-bar/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-viz-chart/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"dependencies": {
"nvd3": "1.8.4",
"polymer": "Polymer/polymer#^1.2.4",
"polymer": "Polymer/polymer#^1",
"paper-item": "PolymerElements/paper-item#^1.0.0",
"paper-menu": "PolymerElements/paper-menu#^1.0.0",
"requirejs": "^2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion elements/urth-viz-cloud/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4",
"polymer": "Polymer/polymer#^1",
"iron-resizable-behavior": "PolymerElements/iron-resizable-behavior#^1.0.0",
"d3-cloud": "latest",
"d3": "^3",
Expand Down
2 changes: 1 addition & 1 deletion elements/urth-viz-col/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-viz-ipywidget/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-viz-line/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-viz-pie/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-viz-scatter/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"tests"
],
"dependencies": {
"polymer": "Polymer/polymer#^1.2.4"
"polymer": "Polymer/polymer#^1"
},
"private": true
}
2 changes: 1 addition & 1 deletion elements/urth-viz-table/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"dependencies": {
"handsontable": "handsontable/handsontable#^0.25",
"polymer": "Polymer/polymer#^1.2.4",
"polymer": "Polymer/polymer#^1",
"requirejs": "^2.1.0"
},
"private": true
Expand Down