Merge branch 'development' into feature/dev-utils-contract-wrappers

This commit is contained in:
Jacob Evans 2019-08-14 11:42:18 +10:00 committed by GitHub
commit ccbb8400ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 12 additions and 20 deletions

View File

@ -9,3 +9,5 @@
# Package specific ignore # Package specific ignore
!bin/**/* !bin/**/*
!solc_bin/.gitkeep !solc_bin/.gitkeep
lib/solc_bin/*
!lib/solc_bin/.gitkeep

View File

@ -9,4 +9,4 @@ envlist = py37
[testenv] [testenv]
commands = commands =
pip install -e .[dev] pip install -e .[dev]
python setup.py lint python setup.py test

View File

@ -9,4 +9,4 @@ envlist = py37
[testenv] [testenv]
commands = commands =
pip install -e .[dev] pip install -e .[dev]
python setup.py lint python setup.py test

View File

@ -227,7 +227,7 @@ with open("README.md", "r") as file_handle:
setup( setup(
name="0x-contract-wrappers", name="0x-contract-wrappers",
version="1.0.0", version="1.0.3",
description="Python wrappers for 0x smart contracts", description="Python wrappers for 0x smart contracts",
long_description=README_MD, long_description=README_MD,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",

View File

@ -161,6 +161,8 @@ setup(
install_requires=["jsonschema", "mypy_extensions", "stringcase"], install_requires=["jsonschema", "mypy_extensions", "stringcase"],
extras_require={ extras_require={
"dev": [ "dev": [
"0x-contract-addresses",
"0x-contract-wrappers",
"bandit", "bandit",
"black", "black",
"coverage", "coverage",

View File

@ -160,6 +160,7 @@ setup(
extras_require={ extras_require={
"dev": [ "dev": [
"0x-contract-addresses", "0x-contract-addresses",
"0x-contract-wrappers",
"0x-order-utils", "0x-order-utils",
"web3", "web3",
"bandit", "bandit",

View File

@ -1,17 +0,0 @@
{
"comment": "this file exists as an entry point to building this project, specifically for humans that are familiar with yarn and already have it installed. this file is not used in any automation or CI.",
"scripts": {
"install": "pip install -e .[dev]",
"build": "python setup.py build && yarn build:docs",
"build:docs": "python setup.py build_sphinx && sphinx-apidoc -o build/docs/api src",
"test:comment": "test in local environment. to test in all environments, use test:all",
"test": "python setup.py test",
"test:all": "tox",
"test:coverage": "coverage run setup.py test && coveralls",
"lint": "python setup.py lint",
"clean": "python setup.py clean"
},
"dependencies:comment": "managed in setup.py",
"devDependencies:comment": "managed in setup.py",
"license": "Apache-2.0"
}

View File

@ -83,7 +83,10 @@ class CleanCommandExtension(clean):
def run(self): def run(self):
"""Run the regular clean, followed by our custom commands.""" """Run the regular clean, followed by our custom commands."""
super().run() super().run()
rmtree("build", ignore_errors=True)
rmtree("dist", ignore_errors=True) rmtree("dist", ignore_errors=True)
rmtree(".coverage", ignore_errors=True)
rmtree(".eggs", ignore_errors=True)
rmtree(".mypy_cache", ignore_errors=True) rmtree(".mypy_cache", ignore_errors=True)
rmtree(".tox", ignore_errors=True) rmtree(".tox", ignore_errors=True)
rmtree(".pytest_cache", ignore_errors=True) rmtree(".pytest_cache", ignore_errors=True)
@ -180,6 +183,7 @@ setup(
], ],
extras_require={ extras_require={
"dev": [ "dev": [
"0x-contract-wrappers",
"bandit", "bandit",
"black", "black",
"coverage", "coverage",