diff --git a/packages/sol-compiler/.npmignore b/packages/sol-compiler/.npmignore index d7e21883c6..8bf011e330 100644 --- a/packages/sol-compiler/.npmignore +++ b/packages/sol-compiler/.npmignore @@ -9,3 +9,5 @@ # Package specific ignore !bin/**/* !solc_bin/.gitkeep +lib/solc_bin/* +!lib/solc_bin/.gitkeep diff --git a/python-packages/contract_addresses/tox.ini b/python-packages/contract_addresses/tox.ini index aa1037ed7c..1cce32b5f0 100644 --- a/python-packages/contract_addresses/tox.ini +++ b/python-packages/contract_addresses/tox.ini @@ -9,4 +9,4 @@ envlist = py37 [testenv] commands = pip install -e .[dev] - python setup.py lint + python setup.py test diff --git a/python-packages/contract_artifacts/tox.ini b/python-packages/contract_artifacts/tox.ini index aa1037ed7c..1cce32b5f0 100644 --- a/python-packages/contract_artifacts/tox.ini +++ b/python-packages/contract_artifacts/tox.ini @@ -9,4 +9,4 @@ envlist = py37 [testenv] commands = pip install -e .[dev] - python setup.py lint + python setup.py test diff --git a/python-packages/contract_wrappers/setup.py b/python-packages/contract_wrappers/setup.py index f1ac8fc2f2..1ab2c84775 100755 --- a/python-packages/contract_wrappers/setup.py +++ b/python-packages/contract_wrappers/setup.py @@ -227,7 +227,7 @@ with open("README.md", "r") as file_handle: setup( name="0x-contract-wrappers", - version="1.0.0", + version="1.0.3", description="Python wrappers for 0x smart contracts", long_description=README_MD, long_description_content_type="text/markdown", diff --git a/python-packages/json_schemas/setup.py b/python-packages/json_schemas/setup.py index 51f79c57d1..650e2d8469 100755 --- a/python-packages/json_schemas/setup.py +++ b/python-packages/json_schemas/setup.py @@ -161,6 +161,8 @@ setup( install_requires=["jsonschema", "mypy_extensions", "stringcase"], extras_require={ "dev": [ + "0x-contract-addresses", + "0x-contract-wrappers", "bandit", "black", "coverage", diff --git a/python-packages/middlewares/setup.py b/python-packages/middlewares/setup.py index 1477b5e6fd..3a02febcf0 100755 --- a/python-packages/middlewares/setup.py +++ b/python-packages/middlewares/setup.py @@ -160,6 +160,7 @@ setup( extras_require={ "dev": [ "0x-contract-addresses", + "0x-contract-wrappers", "0x-order-utils", "web3", "bandit", diff --git a/python-packages/order_utils/package.json b/python-packages/order_utils/package.json deleted file mode 100644 index 125ca71e05..0000000000 --- a/python-packages/order_utils/package.json +++ /dev/null @@ -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" -} diff --git a/python-packages/order_utils/setup.py b/python-packages/order_utils/setup.py index c819012632..e7a4b2e2fd 100755 --- a/python-packages/order_utils/setup.py +++ b/python-packages/order_utils/setup.py @@ -83,7 +83,10 @@ class CleanCommandExtension(clean): def run(self): """Run the regular clean, followed by our custom commands.""" super().run() + rmtree("build", 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(".tox", ignore_errors=True) rmtree(".pytest_cache", ignore_errors=True) @@ -180,6 +183,7 @@ setup( ], extras_require={ "dev": [ + "0x-contract-wrappers", "bandit", "black", "coverage",