Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

package.json cleanup + npm run test alignment #65

Merged
merged 9 commits into from
Jan 31, 2019
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
8 changes: 2 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ branches:
only:
- master
- develop
- /^release-.*/
notifications:
email:
recipients:
Expand All @@ -17,13 +18,8 @@ before_install:
- sudo apt-get update
- sudo apt-get install nodejs
- sudo apt-get install npm
- sudo apt-get install software-properties-common
- sudo add-apt-repository -y ppa:ethereum/ethereum
- sudo apt-get update
install:
- npm install
- npm install -g mocha
script:
- mocha --recursive --timeout 120000 test --exit
after_script:
- kill $(ps aux | grep 'openst-setup/origin-geth' | awk '{print $2}')
- npm run test
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## 0.10.0
# brandedtoken.js Change Log

## Version 0.10.0

Updated package.json and npm run alignment ([#65](https://github.com/OpenSTFoundation/brandedtoken.js/pull/65))
Integration test files cleanup ([#60](https://github.com/OpenSTFoundation/brandedtoken.js/pull/60))
Use docker geth instance for testing ([#58](https://github.com/OpenSTFoundation/brandedtoken.js/pull/58))
Directory structure improvements ([#54](https://github.com/OpenSTFoundation/brandedtoken.js/pull/54))
Expand Down
40 changes: 24 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
{
"name": "@openstfoundation/branded-token.js",
"version": "0.1.0",
"description": "JS interaction layer to interact with branded-tokens and composer contracts.",
"name": "@openstfoundation/brandedtoken.js",
"version": "0.10.0",
"description": "JS interaction layer to interact with branded tokens and gateway composer contracts.",
"main": "index.js",
"scripts": {
"pre-commit": "lint-staged"
},
"repository": {
"type": "git",
"url": "git+https://github.com/OpenSTFoundation/branded-token.js.git"
"url": "git+https://github.com/OpenSTFoundation/brandedtoken.js.git"
},
"keywords": [
"OpenST",
"OST",
"Mosaic",
"BrandedToken",
"Simple Token",
"Token Economy",
"web3",
"Ethereum",
"EIP20"
],
"homepage": "https://openst.org",
"author": "OpenST Ltd.",
"author": "OpenST Limited",
"license": "LGPL-3.0",
"bugs": {
"url": "https://github.com/OpenSTFoundation/branded-token.js/issues"
"url": "https://github.com/OpenSTFoundation/brandedtoken.js/issues"
},
"scripts": {
"test": "mocha --recursive --timeout 120000 test --exit",
"pre-commit": "lint-staged"
},
"dependencies": {
"@openstfoundation/mosaic-tbd": "https://github.com/OpenSTFoundation/mosaic-tbd.git"
Expand All @@ -44,13 +45,20 @@
"abi-decoder": "1.2.0",
"wait-port": "0.2.2"
},
"pre-commit": [
"pre-commit"
],
"pre-commit": {
"run": [
"pre-commit"
]
},
"lint-staged": {
"*.js": [
"prettier --write --config .prettierrc.json",
"git add"
"linters": {
"*.js": [
"prettier --write --config .prettierrc.json",
"git add"
]
},
"ignore": [
"**/dist/*.js"
]
}
}