Skip to content

Commit

Permalink
Merge branch 'release/0.5.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
xeroc committed Feb 28, 2017
2 parents de3117e + b15aeaf commit 98de98e
Show file tree
Hide file tree
Showing 99 changed files with 484 additions and 10,468 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ TAGSTEEM := $(shell git describe master --abbrev=0 | tr "." "-")
clean: clean-build clean-pyc

clean-build:
rm -fr build/
rm -fr dist/
rm -fr *.egg-info
rm -fr __pycache__/
rm -fr build/ dist/ *.egg-info .eggs/ .tox/ __pycache__/ .cache/ .coverage htmlcov src

clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '*~' -exec rm -f {} +

lint:
flake8 grapheneapi/ graphenebase/ grapheneextra/
flake8 grapheneapi/ graphenebase/

test:
python3 setup.py test

build:
python3 setup.py build
Expand Down
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Python 3 library for Graphene 2.0!

**Stable**

[![docs master](https://readthedocs.io/projects/python-graphenelib/badge/?version=latest)](http://python-graphenelib.readthedocs.io/en/latest/)
[![docs master](https://readthedocs.org/projects/python-graphenelib/badge/?version=latest)](http://python-graphenelib.readthedocs.io/en/latest/)
[![Travis master](https://travis-ci.org/xeroc/python-graphenelib.png?branch=master)](https://travis-ci.org/xeroc/python-graphenelib)
[![codecov](https://codecov.io/gh/xeroc/python-graphenelib/branch/master/graph/badge.svg)](https://codecov.io/gh/xeroc/python-graphenelib)

Expand All @@ -16,7 +16,7 @@ Python 3 library for Graphene 2.0!

**Develop**

[![docs develop](https://readthedocs.io/projects/python-graphenelib/badge/?version=develop)](http://python-graphenelib.readthedocs.io/en/develop/)
[![docs develop](https://readthedocs.org/projects/python-graphenelib/badge/?version=develop)](http://python-graphenelib.readthedocs.io/en/develop/)
[![Travis develop](https://travis-ci.org/xeroc/python-graphenelib.png?branch=develop)](https://travis-ci.org/xeroc/python-graphenelib)
[![codecov develop](https://codecov.io/gh/xeroc/python-graphenelib/branch/develop/graph/badge.svg)](https://codecov.io/gh/xeroc/python-graphenelib)

Expand All @@ -41,8 +41,6 @@ Some dependencies are not required for parts of the library to run
properly. However these modules require some additional libraries to be
present:

* `graphenews`
* `autobahn>=0.14`
* `graphenebase.bip38`
* `pycrypto==2.6.1`
* `scrypt==0.7.1` (to speedup scrypt hashing)
Expand All @@ -69,4 +67,4 @@ html with:
Licence
-------

See `LICENCE.txt`
MIT, see `LICENCE.txt`
19 changes: 0 additions & 19 deletions docs/classes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,13 @@ Classes
The library comes with a set of classes that are separated in different
packages:

Exchange Package
################

.. toctree::
:maxdepth: 1

exchange

API Package
###########

.. toctree::
:maxdepth: 1

client
rpc
websocket
websocketrpc

Base Package
Expand All @@ -32,13 +22,4 @@ Base Package

base58
account
memo
bip38

Extra Package
#############

.. toctree::
:maxdepth: 1

proposal
15 changes: 0 additions & 15 deletions docs/client.rst

This file was deleted.

119 changes: 0 additions & 119 deletions docs/exchange.rst

This file was deleted.

58 changes: 0 additions & 58 deletions docs/graphene-ws.rst

This file was deleted.

Loading

0 comments on commit 98de98e

Please sign in to comment.