Merge pull request #2905 from ethereum/release/1.0

Release - 1.0
web3 · Jul 23, 2019 · 54feed8 · 54feed8
2 parents fcaaca9 + 933b014
commit 54feed8
Show file tree

Hide file tree

Showing 71 changed files with 4,606 additions and 2,357 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ node_js:
     - "8"
     - "10"
     - "11"
-    - "12"
 env:
     - CXX=g++-4.8
 addons:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 -->
 
+## [1.2.0]
+
+Released with 1.0.0-beta.37 code base.
+
 ## [Unreleased]
 
-## [1.0.0]
+## [1.2.1]
+
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-**PREVIEW RELEASE** This is a beta preview release (beta.37) with breaking changes!
 
 <img src="https://github.com/ethereum/web3.js/raw/1.0/web3js.jpg" width=200 />
 
@@ -21,13 +20,13 @@ Please read the [documentation][docs] for more.
 ### Node
 
 ```bash
-npm install web3@1.0.0-beta.37
+npm install web3
 ```
 
 ### Yarn
 
 ```bash
-yarn add web3@1.0.0-beta.37
+yarn add web3
 ```
 
 ### Meteor

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "namespace": "ethereum",
   "name": "web3",
-  "version": "1.0.0-beta.37",
+  "version": "1.0.0",
   "description": "Ethereum JavaScript API",
   "license": "LGPL-3.0",
   "main": [

diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/docs/callbacks-promises-events.rst b/docs/callbacks-promises-events.rst
@@ -1,7 +1,5 @@
 .. _promiEvent:
 
-.. include:: include_announcement.rst
-
 =========================
 Callbacks Promises Events
 =========================

diff --git a/docs/getting-started.rst b/docs/getting-started.rst
@@ -1,6 +1,4 @@
 
-.. include:: include_announcement.rst
-
 ===============
 Getting Started
 ===============

diff --git a/docs/glossary.rst b/docs/glossary.rst
@@ -1,6 +1,4 @@
 
-.. include:: include_announcement.rst
-
 ========
 Glossary
 ========

diff --git a/docs/include_announcement.rst b/docs/include_announcement.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -1,6 +1,4 @@
 
-.. include:: include_announcement.rst
-
 =================================
 web3.js - Ethereum JavaScript API
 =================================

diff --git a/docs/web3-bzz.rst b/docs/web3-bzz.rst
@@ -1,7 +1,5 @@
 .. _bzz:
 
-.. include:: include_announcement.rst
-
 ========
 web3.bzz
 ========

diff --git a/docs/web3-eth-abi.rst b/docs/web3-eth-abi.rst
@@ -1,7 +1,5 @@
 .. _eth-abi:
 
-.. include:: include_announcement.rst
-
 =========
 web3.eth.abi
 =========

diff --git a/docs/web3-eth-accounts.rst b/docs/web3-eth-accounts.rst
@@ -1,7 +1,5 @@
 .. _eth-accounts:
 
-.. include:: include_announcement.rst
-
 =========
 web3.eth.accounts
 =========

diff --git a/docs/web3-eth-contract.rst b/docs/web3-eth-contract.rst
@@ -1,7 +1,5 @@
 .. _eth-contract:
 
-.. include:: include_announcement.rst
-
 ========
 web3.eth.Contract
 ========

diff --git a/docs/web3-eth-ens.rst b/docs/web3-eth-ens.rst
@@ -1,7 +1,5 @@
 .. _eth-ens:
 
-.. include:: include_announcement.rst
-
 =========
 web3.eth.ens
 =========

diff --git a/docs/web3-eth-iban.rst b/docs/web3-eth-iban.rst
@@ -1,7 +1,5 @@
 .. _eth-iban:
 
-.. include:: include_announcement.rst
-
 =========
 web3.eth.Iban
 =========

diff --git a/docs/web3-eth-net.rst b/docs/web3-eth-net.rst
@@ -1,7 +1,5 @@
 .. _eth-net:
 
-.. include:: include_announcement.rst
-
 =========
 web3.eth.net
 =========

diff --git a/docs/web3-eth-personal.rst b/docs/web3-eth-personal.rst
@@ -1,7 +1,5 @@
 .. _eth-personal:
 
-.. include:: include_announcement.rst
-
 ========
 web3.eth.personal
 ========

diff --git a/docs/web3-eth-subscribe.rst b/docs/web3-eth-subscribe.rst
@@ -1,7 +1,5 @@
 .. _eth-subscribe:
 
-.. include:: include_announcement.rst
-
 =========
 web3.eth.subscribe
 =========

diff --git a/docs/web3-eth.rst b/docs/web3-eth.rst
@@ -1,7 +1,5 @@
 .. _eth:
 
-.. include:: include_announcement.rst
-
 ========
 web3.eth
 ========

diff --git a/docs/web3-net.rst b/docs/web3-net.rst
@@ -1,7 +1,5 @@
 .. _net:
 
-.. include:: include_announcement.rst
-
 ========
 web3.*.net
 ========

diff --git a/docs/web3-shh.rst b/docs/web3-shh.rst
@@ -1,7 +1,5 @@
 .. _shh:
 
-.. include:: include_announcement.rst
-
 ========
 web3.shh
 ========

diff --git a/docs/web3-utils.rst b/docs/web3-utils.rst
@@ -1,7 +1,5 @@
 .. _utils:
 
-.. include:: include_announcement.rst
-
 ========
 web3.utils
 ========

diff --git a/docs/web3.rst b/docs/web3.rst
@@ -1,6 +1,4 @@
 
-.. include:: include_announcement.rst
-
 ====
 Web3
 ====

diff --git a/gulpfile.js b/gulpfile.js
@@ -194,7 +194,6 @@ packages.forEach(function (pckg, i) {
     }));
 });
 
-
 gulp.task('publishTag', function () {
     exec("git commit -am \"add tag v"+ lernaJSON.version +"\"; git tag v"+ lernaJSON.version +"; git push origin v"+ lernaJSON.version +";");
 });
@@ -206,4 +205,3 @@ gulp.task('watch', function () {
 gulp.task('all', gulp.series('version', 'lint', 'clean', packages[packages.length - 1].fileName));
 
 gulp.task('default', gulp.series('version', 'lint', 'clean', packages[0].fileName));
-