Merge branch '1.x' into issue/3386

.travis.yml

@@ -16,10 +16,13 @@ matrix:
       env: TEST=build_and_lint
     - node_js: 10
       env: TEST=unit_and_e2e_clients
-    - node_js: 10
+    - node_js: 12
       env: TEST=e2e_ganache
-    - node_js: 10
+    - node_js: 12
       env: TEST=e2e_mosaic
+    - node_js: 12
+      env: TEST=e2e_windows
+      os: windows
     - node_js: 10
       env: TEST=e2e_ens
     - node_js: 10
@@ -28,10 +31,13 @@ matrix:
         chrome: stable
         firefox: latest
   allow_failures:
-    - node_js: 10
+    - node_js: 12
       env: TEST=e2e_ganache
-    - node_js: 10
+    - node_js: 12
       env: TEST=e2e_mosaic
+    - node_js: 12
+      env: TEST=e2e_windows
+      os: windows
 
 addons:
   apt:
@@ -51,9 +57,6 @@ before_install:
   - export DISPLAY=:99.0
   - export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 install:
-  - if [[ $TEST != "e2e_ganache" ]] && [[ $TEST != "e2e_mosaic" ]]; then
-      npm install;
-    fi
+  - bash ./scripts/install.sh
 script:
-    - npm run ci
-
+  - bash ./scripts/ci.sh

README.md

@@ -164,6 +164,7 @@ The contribution guidelines are provided in [CONTRIBUTIONS](./CONTRIBUTIONS.md)
 -   Scala - [web3j-scala](https://github.com/mslinn/web3j-scala)
 -   Purescript - [purescript-web3](https://github.com/f-o-a-m/purescript-web3)
 -   PHP - [web3.php](https://github.com/sc0Vu/web3.php)
+-   Ruby - [ethereum.rb](https://github.com/EthWorks/ethereum.rb)
 
 [repo]: https://github.com/ethereum/web3.js
 [docs]: http://web3js.readthedocs.io/

packages/web3-core-promievent/package.json

@@ -9,7 +9,6 @@
     },
     "main": "src/index.js",
     "dependencies": {
-        "any-promise": "1.3.0",
         "eventemitter3": "3.1.2"
     }
 }

packages/web3-core-promievent/src/index.js

@@ -23,7 +23,6 @@
 "use strict";
 
 var EventEmitter = require('eventemitter3');
-var Promise = require("any-promise");
 
 /**
  * This function generates a defer promise and adds eventEmitter functionality to it