From 3cd04d8968bfeb741daf358ab22371512723e6b4 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Mon, 25 Jun 2018 22:50:15 -0700 Subject: [PATCH] refactor: drop repo-tool as an exec wrapper (#62) --- packages/google-cloud-language/.circleci/config.yml | 7 +------ packages/google-cloud-language/package.json | 12 ++++++------ packages/google-cloud-language/samples/package.json | 2 +- 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/packages/google-cloud-language/.circleci/config.yml b/packages/google-cloud-language/.circleci/config.yml index c2e7e22befb..6158081695d 100644 --- a/packages/google-cloud-language/.circleci/config.yml +++ b/packages/google-cloud-language/.circleci/config.yml @@ -97,12 +97,7 @@ jobs: fi - run: &npm_install_and_link name: Install and link the module. - command: | - npm install - repo_tools="node_modules/@google-cloud/nodejs-repo-tools/bin/tools" - if ! test -x "$repo_tools"; then - chmod +x "$repo_tools" - fi + command: npm install - run: name: Run unit tests. command: npm test diff --git a/packages/google-cloud-language/package.json b/packages/google-cloud-language/package.json index 9dc8e384721..c8c6426fa54 100644 --- a/packages/google-cloud-language/package.json +++ b/packages/google-cloud-language/package.json @@ -50,14 +50,14 @@ ], "scripts": { "cover": "nyc --reporter=lcov mocha --require intelli-espower-loader test/*.js && nyc report", - "docs": "repo-tools exec -- jsdoc -c .jsdoc.js", + "docs": "jsdoc -c .jsdoc.js", "generate-scaffolding": "repo-tools generate all && repo-tools generate lib_samples_readme -l samples/ --config ../.cloud-repo-tools.json", - "lint": "repo-tools lint --cmd eslint -- src/ samples/ system-test/ test/", - "prettier": "repo-tools exec -- prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", + "lint": "eslint src/ samples/ system-test/ test/", + "prettier": "prettier --write src/*.js src/*/*.js samples/*.js samples/*/*.js test/*.js test/*/*.js system-test/*.js system-test/*/*.js", "samples-test": "cd samples/ && npm test && cd ../", - "system-test": "repo-tools test run --cmd mocha -- system-test/*.js --timeout 600000", - "test-no-cover": "repo-tools test run --cmd mocha -- test/*.js --no-timeouts", - "test": "repo-tools test run --cmd npm -- run cover" + "system-test": "mocha system-test/*.js --timeout 600000", + "test-no-cover": "mocha test/*.js --no-timeouts", + "test": "npm run cover" }, "dependencies": { "google-gax": "^0.16.0", diff --git a/packages/google-cloud-language/samples/package.json b/packages/google-cloud-language/samples/package.json index ca60f635ed6..896ba636117 100644 --- a/packages/google-cloud-language/samples/package.json +++ b/packages/google-cloud-language/samples/package.json @@ -16,7 +16,7 @@ "scripts": { "ava": "ava -T 20s --verbose test/*.test.js ./system-test/*.test.js", "cover": "nyc --reporter=lcov --cache ava -T 20s --verbose test/*.test.js ./system-test/*.test.js && nyc report", - "test": "repo-tools test run --cmd npm -- run cover" + "test": "npm run cover" }, "dependencies": { "@google-cloud/language": "1.2.0",