Merge remote-tracking branch 'upstream/develop' into modular-consensus-rules

Conflicts:
	setup.py

CHANGELOG.md

@@ -0,0 +1,99 @@
+# Change Log (Release Notes)
+All _notable_ changes to this project will be documented in this file (`CHANGELOG.md`).
+This project adheres to [Semantic Versioning](http://semver.org/) (or at least we try).
+Contributors to this file, please follow the guidelines on [keepachangelog.com](http://keepachangelog.com/).
+Note that each version (or "release") is the name of a [Git _tag_](https://git-scm.com/book/en/v2/Git-Basics-Tagging) of a particular commit, so the associated date and time are the date and time of that commit (as reported by GitHub), _not_ the "Uploaded on" date listed on PyPI (which may differ).
+For reference, the possible headings are:
+
+* **Added** for new features.
+* **Changed** for changes in existing functionality.
+* **Deprecated** for once-stable features removed in upcoming releases.
+* **Removed** for deprecated features removed in this release.
+* **Fixed** for any bug fixes.
+* **Security** to invite users to upgrade in case of vulnerabilities.
+
+
+## [Unreleased] - YYYY-MM-DD
+Tag name: TBD
+= commit: TBD
+committed: TBD
+
+### Added
+- `CHANGELOG.md` (this file)
+- Multisig support: [Pull Request #107](https://github.com/bigchaindb/bigchaindb/pull/107)
+- API/Wire protocol (RESTful HTTP API): [Pull Request #102](https://github.com/bigchaindb/bigchaindb/pull/102)
+- Python driver/SDK/API: [Pull Request #102](https://github.com/bigchaindb/bigchaindb/pull/102)
+- Python Style Guide: [Pull Request #89](https://github.com/bigchaindb/bigchaindb/pull/89)
+- Monitoring & dashboard tools: [Pull Request #72](https://github.com/bigchaindb/bigchaindb/pull/72)
+
+### Changed
+- Rewrote [`README.md`](https://github.com/bigchaindb/bigchaindb/blob/develop/README.md) into four sets of links: Pull Requests [#80](https://github.com/bigchaindb/bigchaindb/pull/80) and [#115](https://github.com/bigchaindb/bigchaindb/pull/115)
+
+### Fixed
+- Bug related to config overwrite: [Pull Request #97](https://github.com/bigchaindb/bigchaindb/pull/97)
+- [Issue #71](https://github.com/bigchaindb/bigchaindb/issues/71) (Voter is not validating blocks correctly when checking for double spends) in [Pull Request #76](https://github.com/bigchaindb/bigchaindb/pull/76)
+
+
+## [0.1.4] - 2016-02-22
+Tag name: v0.1.4 
+= commit: c4c850f480bc9ae72df2a54f81c0825b6fb4ed62 
+committed: Feb 22, 2016, 11:51 AM GMT+1
+
+### Added
+- Added to `classifiers` to setup.py
+
+### Changed
+- Allow running pytest tests in parallel (using [xdist](http://pytest.org/latest/xdist.html)): [Pull Request #65](https://github.com/bigchaindb/bigchaindb/pull/65)
+- Allow non-interactive first start: [Pull Request #64](https://github.com/bigchaindb/bigchaindb/pull/64) to resolve [Issue #58](https://github.com/bigchaindb/bigchaindb/issues/58)
+
+
+## [0.1.3] - 2016-02-16
+Tag name: v0.1.3
+= commit 8926e3216c1ee39b9bc332e5ef1df2a8901262dd
+committed Feb 16, 2016, 11:37 AM GMT+1
+
+### Changed
+- Changed from using Git Flow to GitHub flow (but with `develop` as the default branch).
+
+
+## [0.1.2] - 2016-02-15
+Tag name: v0.1.2 
+= commit d2ff24166d69dda68dd7b4a24a88279b1d37e222 
+committed Feb 15, 2016, 2:23 PM GMT+1
+
+### Added
+- Various tests
+
+### Fixed
+- Fix exception when running `start`: [Pull Request #32](https://github.com/bigchaindb/bigchaindb/pull/32) resolved [Issue #35]
+
+## [0.1.1] - 2016-02-15
+Tag name: v0.1.1 
+= commit 2a025448b29fe7056760de1039c73bbcfe992461 
+committed Feb 15, 2016, 10:48 AM GMT+1
+
+### Added
+- "release 0.1.1": [Pull Request #37](https://github.com/bigchaindb/bigchaindb/pull/37)
+
+### Removed
+- `tox.ini` [Pull Request #18](https://github.com/bigchaindb/bigchaindb/pull/18)
+- `requirements.txt` in the root directory, and the entire `requirements/` directory: [Pull Request #14](https://github.com/bigchaindb/bigchaindb/pull/14)
+
+### Fixed
+- Hotfix for AttributeError, fixed [Issue #27](https://github.com/bigchaindb/bigchaindb/issues/27)
+
+
+## [0.1.0] - 2016-02-10
+Tag name: v0.1.0
+= commit 8539e8dc2d036a4e0a866a3fb9e55889503254d5
+committed Feb 10, 2016, 10:04 PM GMT+1
+
+The first public release of BigchainDB, including:
+
+- Initial BigchainDB Server code, including many tests and some code for benchmarking.
+- Initial documentation (in `bigchaindb/docs`).
+- Initial `README.md`, `ROADMAP.md`, `CODE_OF_CONDUCT.md`, and `CONTRIBUTING.md`.
+- Packaging for PyPI, including `setup.py` and `setup.cfg`.
+- Initial `Dockerfile` and `docker-compose.yml` (for deployment using Docker and Docker Compose).
+- Initial `.gitignore` (list of things for git to ignore).
+- Initial `.travis.yml` (used by Travis CI).

CONTRIBUTING.md

@@ -84,6 +84,8 @@ git merge upstream/develop
 
 Once you're done commiting a set of new things and you're ready to submit them for inclusion, please be sure to run all the tests (as per the instructions at the end of our [Python Style Guide](PYTHON_STYLE_GUIDE.md)).
 
+If your addition or change is substantial, then please add a line or two to the [CHANGELOG.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/CHANGELOG.md), following the guidelines given at the top of that file.
+
 (When you submit your pull request [following the instructions below], we run all the tests automatically, so we will see if some are failing. If you don't know why some tests are failing, you can still submit your pull request, but be sure to note the failing tests and to ask for help with resolving them.)
 
 ### Step 6 - Push Your New Branch to origin

LICENSES.md

@@ -2,7 +2,7 @@
 
 All officially-supported BigchainDB _driver code_ is licensed under the Apache License, Version 2.0, the full text of which can be found at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
 
-All short code snippets embedded in the official BigchainDB _documentation_ is licensed under the Apache License, Version 2.0, the full text of which can be found at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
+All short code snippets embedded in the official BigchainDB _documentation_ are licensed under the Apache License, Version 2.0, the full text of which can be found at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0).
 
 All _other_ officially-supported BigchainDB code is licensed under the GNU Affero General Public License version 3 (AGPLv3), the full text of which can be found at [http://www.gnu.org/licenses/agpl.html](http://www.gnu.org/licenses/agpl.html).
 

ROADMAP.md

@@ -19,11 +19,3 @@
 ## Other/Future
 * Byzantine fault tolerance
 * Better support for smart contract frameworks
-
-## Done/Past (i.e. was in the Roadmap)
-* Packaging for PyPI (setup.py etc.) - [the latest version release can be found on PyPI](https://pypi.python.org/pypi/BigchainDB)
-* Dockerization
-* Monitoring/dashboard - initial vesion added in [Pull Request #72](https://github.com/bigchaindb/bigchaindb/pull/72)
-* API/Wire protocol (RESTful HTTP API) - initial version added in [Pull Request #102](https://github.com/bigchaindb/bigchaindb/pull/102)
-* Python driver/SDK - initial version added in [Pull Request #102](https://github.com/bigchaindb/bigchaindb/pull/102)
-* Multisig support - initial version added in [Pull Request #107](https://github.com/bigchaindb/bigchaindb/pull/107)

docs/source/_templates/license-template.html

@@ -1,4 +0,0 @@
-<h3>License</h3>
-<p>
-This documentation is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
-</p>

docs/source/_templates/sidebar-links-template.html

@@ -1,6 +0,0 @@
-<h3>Quick links</h3>
-<p>
-<a href="https://github.com/bigchaindb/bigchaindb">GitHub repository</a>
-<br>
-<a href="https://www.bigchaindb.com/">BigchainDB website</a>
-</p>

docs/source/_templates/sidebar-title-template.html

@@ -1 +0,0 @@
-<h1>BigchainDB Documentation</h1>

docs/source/conf.py

@@ -168,13 +168,10 @@ html_static_path = ['_static']
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-html_sidebars = {
-    '**': ['sidebar-title-template.html',
-           'globaltoc.html',
-           'sidebar-links-template.html',
-           'searchbox.html',
-           'license-template.html'],
-}
+#html_sidebars = {
+#    '**': ['globaltoc.html',
+#           'searchbox.html'],
+#}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.

docs/source/index.rst

@@ -23,6 +23,7 @@ Table of Contents
    json-serialization
    developer-interface
    monitoring
+   licenses
    contributing
    faq
    release-notes

docs/source/licenses.md

@@ -0,0 +1,3 @@
+# Licenses
+
+Information about how the BigchainDB code and documentation are licensed can be found in [the LICENSES.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/LICENSES.md) (in the root directory of the repository).

docs/source/release-notes.md

@@ -4,4 +4,6 @@ You can find a list of all BigchainDB releases and release notes on GitHub at:
 
 [https://github.com/bigchaindb/bigchaindb/releases](https://github.com/bigchaindb/bigchaindb/releases)
 
-We also have [a roadmap document in bigchaindb/ROADMAP.md](https://github.com/bigchaindb/bigchaindb/blob/develop/ROADMAP.md).
+The [CHANGELOG.md file](https://github.com/bigchaindb/bigchaindb/blob/develop/CHANGELOG.md) contains much the same information, but it also has notes about what to expect in the _next_ release.
+
+We also have [a roadmap document in ROADMAP.md](https://github.com/bigchaindb/bigchaindb/blob/develop/ROADMAP.md).

setup.py

@@ -59,7 +59,8 @@ setup(
     packages=[
         'bigchaindb',
         'bigchaindb.commands',
-        'bigchaindb.db'
+        'bigchaindb.db',
+        'bigchaindb.web'
     ],
 
     entry_points={