diff --git a/README.md b/README.md index 8ad6bf5b9a..b22fa67f82 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ Visit our [developer portal](https://0xproject.com/docs/order-utils) for a compr | -------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | | [`0x-contract-addresses`](/python-packages/contract_addresses) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-addresses.svg)](https://pypi.org/project/0x-contract-addresses/) | A tiny utility library for getting known deployed contract addresses for a particular network | | [`0x-contract-artifacts`](/python-packages/contract_artifacts) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-artifacts.svg)](https://pypi.org/project/0x-contract-artifacts/) | 0x smart contract compilation artifacts | +| [`0x-contract-wrappers`](/python-packages/contract_wrappers) | [![PyPI](https://img.shields.io/pypi/v/0x-contract-wrappers.svg)](https://pypi.org/project/0x-contract-wrappers/) | 0x smart contract wrappers | | [`0x-json-schemas`](/python-packages/json_schemas) | [![PyPI](https://img.shields.io/pypi/v/0x-json-schemas.svg)](https://pypi.org/project/0x-json-schemas/) | 0x-related JSON schemas | | [`0x-order-utils`](/python-packages/order_utils) | [![PyPI](https://img.shields.io/pypi/v/0x-order-utils.svg)](https://pypi.org/project/0x-order-utils/) | A set of utilities for generating, parsing, signing and validating 0x orders | | [`0x-sra-client`](/python-packages/sra_client) | [![PyPI](https://img.shields.io/pypi/v/0x-sra-client.svg)](https://pypi.org/project/0x-sra-client/) | A Python client for interacting with servers conforming to the Standard Relayer API specification | diff --git a/python-packages/contract_addresses/CHANGELOG.md b/python-packages/contract_addresses/CHANGELOG.md index 4afa42907e..7a5747ff25 100644 --- a/python-packages/contract_addresses/CHANGELOG.md +++ b/python-packages/contract_addresses/CHANGELOG.md @@ -1,11 +1,16 @@ # Changelog -## 2.0.1 - 2019-02-25 +## 2.2.0 - 2019-08-08 -- Updated addresses of OrderValidator and Forwarder contracts. +- Added ERC1155Proxy address +- Updated addresses for AssetProxyOwner, Coordinator, CoordinatorRegistry, Forwarder, and OrderValidator. ## 2.1.0 - 2019-07-15 - Added Coordinator and CoordinatorRegistry addresses. - Expanded documentation. - Redeployed Mainnet V2.1 Exchange et al + +## 2.0.1 - 2019-02-25 + +- Updated addresses of OrderValidator and Forwarder contracts. diff --git a/python-packages/contract_addresses/setup.py b/python-packages/contract_addresses/setup.py index 1aa2231097..1e1d811f6e 100755 --- a/python-packages/contract_addresses/setup.py +++ b/python-packages/contract_addresses/setup.py @@ -119,7 +119,7 @@ with open("README.md", "r") as file_handle: setup( name="0x-contract-addresses", - version="2.1.0", + version="2.2.0", description="Addresses at which the 0x smart contracts have been deployed", long_description=README_MD, long_description_content_type="text/markdown", diff --git a/python-packages/contract_wrappers/CHANGELOG.md b/python-packages/contract_wrappers/CHANGELOG.md index ed6bacd144..0414c05a8a 100644 --- a/python-packages/contract_wrappers/CHANGELOG.md +++ b/python-packages/contract_wrappers/CHANGELOG.md @@ -1,5 +1,5 @@ # Changelog -## 1.0.0 - TBD +## 1.0.0 - 2019-08-08 - Initial release diff --git a/python-packages/contract_wrappers/setup.py b/python-packages/contract_wrappers/setup.py index 0bb2c4e527..c057a0bc14 100755 --- a/python-packages/contract_wrappers/setup.py +++ b/python-packages/contract_wrappers/setup.py @@ -18,6 +18,30 @@ from setuptools.command.test import test as TestCommand BLACK_COMMAND = "black --line-length 79 " +CONTRACTS_TO_BE_WRAPPED = [ + "asset_proxy_owner", + "coordinator", + "coordinator_registry", + "dummy_erc20_token", + "dummy_erc721_token", + "dutch_auction", + "erc20_proxy", + "erc20_token", + "erc721_proxy", + "erc721_token", + "eth_balance_checker", + "exchange", + "forwarder", + "i_asset_proxy", + "i_validator", + "i_wallet", + "multi_asset_proxy", + "order_validator", + "weth9", + "zrx_token", +] + + class PreInstallCommand(distutils.command.build_py.build_py): """Custom setuptools command class for pulling in generated code.""" @@ -26,29 +50,7 @@ class PreInstallCommand(distutils.command.build_py.build_py): def run(self): """Copy files from TS build area to local src, & `black` them.""" pkgdir = path.dirname(path.realpath(argv[0])) - contracts = [ - "asset_proxy_owner", - "coordinator", - "coordinator_registry", - "dummy_erc20_token", - "dummy_erc721_token", - "dutch_auction", - "erc20_proxy", - "erc20_token", - "erc721_proxy", - "erc721_token", - "eth_balance_checker", - "exchange", - "forwarder", - "i_asset_proxy", - "i_validator", - "i_wallet", - "multi_asset_proxy", - "order_validator", - "weth9", - "zrx_token", - ] - for contract in contracts: + for contract in CONTRACTS_TO_BE_WRAPPED: copy( path.join( pkgdir, @@ -84,7 +86,7 @@ class PreInstallCommand(distutils.command.build_py.build_py): black_command = BLACK_COMMAND + " ".join( [ f"src/zero_ex/contract_wrappers/{contract}/__init__.py" - for contract in contracts + for contract in CONTRACTS_TO_BE_WRAPPED ] ) print(f"Running command `{black_command}`...") @@ -158,8 +160,11 @@ class CleanCommandExtension(clean): rmtree(".pytest_cache", ignore_errors=True) rmtree("src/0x_contract_wrappers.egg-info", ignore_errors=True) # generated files: - remove("src/zero_ex/contract_wrappers/exchange/__init__.py") - remove("src/zero_ex/contract_wrappers/erc20_token/__init__.py") + for contract in CONTRACTS_TO_BE_WRAPPED: + try: + remove(f"src/zero_ex/contract_wrappers/{contract}/__init__.py") + except FileNotFoundError: + pass class TestPublishCommand(distutils.command.build_py.build_py): diff --git a/python-packages/order_utils/CHANGELOG.md b/python-packages/order_utils/CHANGELOG.md index 900d16763e..563f3fc2ac 100644 --- a/python-packages/order_utils/CHANGELOG.md +++ b/python-packages/order_utils/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 3.0.0 - TBD +## 3.0.0 - 2019-08-08 - Major breaking changes: removal of definitions for Order, OrderInfo, order_to_jsdict, jsdict_to_order, all of which have been moved to contract_wrappers.exchange.types; removal of signature validation; migration from v4 to v5 of Web3.py diff --git a/python-packages/order_utils/setup.py b/python-packages/order_utils/setup.py index 0dfabdf673..f8a9a12838 100755 --- a/python-packages/order_utils/setup.py +++ b/python-packages/order_utils/setup.py @@ -149,7 +149,7 @@ with open("README.md", "r") as file_handle: setup( name="0x-order-utils", - version="2.0.0", + version="3.0.0", description="Order utilities for 0x applications", long_description=README_MD, long_description_content_type="text/markdown", diff --git a/python-packages/prep_for_staging_doc_publish b/python-packages/prep_for_staging_doc_publish new file mode 100755 index 0000000000..83ac518963 --- /dev/null +++ b/python-packages/prep_for_staging_doc_publish @@ -0,0 +1,5 @@ +find ./ \ + -name .discharge.json \ + -exec sed -i \ + -e "s/\(domain.*\)\",$/\1-staging\",/" \ + {} \; diff --git a/python-packages/sra_client/CHANGELOG.md b/python-packages/sra_client/CHANGELOG.md index ed5f2ef649..1220c1a349 100644 --- a/python-packages/sra_client/CHANGELOG.md +++ b/python-packages/sra_client/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 3.0.0 - TBD +## 3.0.0 - 2019-08-08 - Migrated from v4 to v5 of Web3.py. diff --git a/python-packages/sra_client/setup.py b/python-packages/sra_client/setup.py index 07a3503562..a79d148c47 100755 --- a/python-packages/sra_client/setup.py +++ b/python-packages/sra_client/setup.py @@ -14,7 +14,7 @@ from setuptools import setup, find_packages # noqa: H301 from setuptools.command.test import test as TestCommand NAME = "0x-sra-client" -VERSION = "2.0.0" +VERSION = "3.0.0" # To install the library, run the following # # python setup.py install @@ -170,7 +170,8 @@ setup( name=NAME, version=VERSION, description="Standard Relayer REST API Client", - author_email="", + author="F. Eugene Aumson", + author_email="feuGeneA@users.noreply.github.com", url=( "https://github.com/0xproject/0x-monorepo/tree/development" "/python-packages/sra_client"