Merge pull request brianc#1369 from brianc/7.0

7.0

Author: brianc

.eslintrc

@@ -0,0 +1,6 @@
+{
+  "extends": "standard",
+  "rules": {
+    "no-new-func": "off"
+  }
+}

.jshintrc

@@ -6,39 +6,30 @@ before_script:
 env:
   - CC=clang CXX=clang++ npm_config_clang=1 PGUSER=postgres PGDATABASE=postgres
 
-node_js: "6"
-addons:
-  postgresql: "9.6"
-
 matrix:
   include:
-    - node_js: "0.10"
-      addons:
-        postgresql: "9.6"
-      env: []
-    - node_js: "0.12"
+    - node_js: "lts/argon"
       addons:
         postgresql: "9.6"
-      env: []
-    - node_js: "4"
-      addons:
-        postgresql: "9.6"
-    - node_js: "5"
-      addons:
-        postgresql: "9.6"
-    - node_js: "6"
+    - node_js: "lts/boron"
       addons:
         postgresql: "9.1"
       dist: precise
-    - node_js: "6"
+    - node_js: "lts/boron"
       addons:
         postgresql: "9.2"
-    - node_js: "6"
+    - node_js: "lts/boron"
       addons:
         postgresql: "9.3"
-    - node_js: "6"
+    - node_js: "lts/boron"
       addons:
         postgresql: "9.4"
-    - node_js: "6"
+    - node_js: "lts/boron"
       addons:
         postgresql: "9.5"
+    - node_js: "lts/boron"
+      addons:
+        postgresql: "9.6"
+    - node_js: "8"
+      addons:
+        postgresql: "9.6"

.travis.yml

@@ -4,16 +4,6 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
-### v6.4.0
-
-- Add support for passing `client_encoding` as a connection parameter.  Used when decoding strings in the JavaScript driver.  The default is still `utf8`.
-
-### v6.3.0
-
-- Deprecate `pg.connect` `pg.end` and `pg.cancel` - favor using `new pg.Pool()` instead of pg singleton.
-- Deprecate undocumented but possibly used `query.promise()` method. Use the promise returned directly from `client.query` / `pool.query`.
-- Deprecate returning an automatically created query result from `client.query`.  Instead return more idomatic responses for callback/promise methods.
-
 ### v6.2.0
 
 - Add support for [parsing `replicationStart` messages](https://github.com/brianc/node-postgres/pull/1271/files).

CHANGELOG.md

@@ -7,7 +7,7 @@ params := $(connectionString)
 node-command := xargs -n 1 -I file node file $(params)
 
 .PHONY : test test-connection test-integration bench test-native \
-	 jshint publish test-missing-native update-npm
+	 lint publish test-missing-native update-npm
 
 all:
 	npm install
@@ -17,7 +17,7 @@ help:
 
 test: test-unit
 
-test-all: jshint test-missing-native test-unit test-integration test-native test-binary
+test-all: lint test-missing-native test-unit test-integration test-native
 
 
 update-npm:
@@ -36,8 +36,10 @@ test-connection:
 test-missing-native:
 	@echo "***Testing optional native install***"
 	@rm -rf node_modules/pg-native
+	@rm -rf node_modules/libpq
 	@node test/native/missing-native.js
 	@rm -rf node_modules/pg-native
+	@rm -rf node_modules/libpq
 
 node_modules/pg-native/index.js:
 	@npm i pg-native
@@ -58,6 +60,6 @@ test-binary: test-connection
 test-pool:
 	@find test/integration/connection-pool -name "*.js" | $(node-command) binary
 
-jshint:
-	@echo "***Starting jshint***"
-	@./node_modules/.bin/jshint lib
+lint:
+	@echo "***Starting lint***"
+	eslint lib