-
Notifications
You must be signed in to change notification settings - Fork 13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove web3[tester] dep from core dependencies #160
Open
njgheorghita
wants to merge
1
commit into
ethpm:master
Choose a base branch
from
njgheorghita:remove-web3-splinter-dep
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,81 +2,91 @@ | |
| # -*- coding: utf-8 -*- | ||
| import os | ||
|
|
||
| from setuptools import ( | ||
| setup, | ||
| find_packages, | ||
| ) | ||
| from setuptools.command.develop import develop as _develop | ||
| from setuptools import setup, find_packages | ||
| from subprocess import check_call | ||
|
|
||
|
|
||
| DIR = os.path.dirname(os.path.abspath(__file__)) | ||
| readme = open(os.path.join(DIR, "README.md")).read() | ||
| WEB3_VERSION = "5.0.0b2,<6.0.0" | ||
|
|
||
|
|
||
| class develop(_develop): | ||
| """ | ||
| Post-installation to make sure web3 tester extras are installed. | ||
| """ | ||
|
|
||
| def run(self): | ||
| _develop.run(self) | ||
| check_call(["pip", "install", f"web3[tester]>={WEB3_VERSION}"]) | ||
|
|
||
| readme = open(os.path.join(DIR, 'README.md')).read() | ||
|
|
||
| extras_require={ | ||
| 'test': [ | ||
| 'pytest>=3.2.1,<4', | ||
| 'pytest-ethereum>=0.1.3a.6,<1', | ||
| 'tox>=1.8.0,<2', | ||
| extras_require = { | ||
| "test": [ | ||
| "pytest>=4.4.0,<5", | ||
| "pytest-ethereum>=0.1.3a.6,<1", | ||
| "tox>=1.8.0,<2" | ||
| ], | ||
| 'lint': [ | ||
| 'black>=19.3b0,<20', | ||
| 'isort>=4.3.17,<5', | ||
| 'flake8>=3.7.0,<4', | ||
| 'mypy<0.800', | ||
| "lint": [ | ||
| "black>=19.3b0,<20", | ||
| "isort>=4.3.17,<5", | ||
| "flake8>=3.7.0,<4", | ||
| "mypy<0.800" | ||
| ], | ||
| 'doc': [ | ||
| 'Sphinx>=1.5.5,<2', | ||
| 'sphinx_rtd_theme>=0.1.9,<2', | ||
| "doc": [ | ||
| "Sphinx>=1.5.5,<2", | ||
| "sphinx_rtd_theme>=0.1.9,<2" | ||
| ], | ||
| 'dev': [ | ||
| 'bumpversion>=0.5.3,<1', | ||
| 'ipython>=7.2.0,<8', | ||
| 'pytest-watch>=4.1.0,<5', | ||
| 'twine', | ||
| 'wheel', | ||
| "dev": [ | ||
| "bumpversion>=0.5.3,<1", | ||
| "ipython>=7.2.0,<8", | ||
| "pytest-watch>=4.1.0,<5", | ||
| "twine", | ||
| "wheel", | ||
| ], | ||
| } | ||
|
|
||
| extras_require['dev'] = ( | ||
| extras_require['dev'] | ||
| + extras_require['test'] | ||
| + extras_require['lint'] | ||
| + extras_require['doc'] | ||
| extras_require["dev"] = ( | ||
| extras_require["dev"] | ||
| + extras_require["test"] | ||
| + extras_require["lint"] | ||
| + extras_require["doc"] | ||
| ) | ||
|
|
||
| setup( | ||
| name='ethpm', | ||
| name="ethpm", | ||
| # *IMPORTANT*: Don't manually change the version here. Use the 'bumpversion' utility. | ||
| version='0.1.4-alpha.19', | ||
| version="0.1.4-alpha.19", | ||
| description="""Python abstraction for ERC190 packages.""", | ||
| long_description_markdown_filename='README.md', | ||
| author='Piper Merriam', | ||
| author_email='[email protected]', | ||
| url='https://github.com/ethpm/py-ethpm', | ||
| long_description_markdown_filename="README.md", | ||
| author="Piper Merriam", | ||
| author_email="[email protected]", | ||
| url="https://github.com/ethpm/py-ethpm", | ||
| include_package_data=True, | ||
| install_requires=[ | ||
| 'eth-utils>=1.6.0,<2', | ||
| 'ipfshttpclient>=0.4.12,<1', | ||
| 'jsonschema>=2.6.0,<3', | ||
| 'protobuf>=3.0.0,<4', | ||
| 'rlp>=1.0.1,<2', | ||
| 'web3[tester]>=5.0.0b1,<6', | ||
| "eth-utils>=1.6.0,<2", | ||
| "ipfshttpclient>=0.4.12,<1", | ||
| "jsonschema>=2.6.0,<3", | ||
| "protobuf>=3.0.0,<4", | ||
| "rlp>=1.0.1,<2", | ||
| f"web3>={WEB3_VERSION}", | ||
| ], | ||
| setup_requires=['setuptools-markdown'], | ||
| python_requires='>=3.6, <4', | ||
| setup_requires=["setuptools-markdown"], | ||
| python_requires=">=3.6, <4", | ||
| extras_require=extras_require, | ||
| py_modules=['ethpm'], | ||
| license='MIT', | ||
| cmdclass={"develop": develop}, | ||
| py_modules=["ethpm"], | ||
| license="MIT", | ||
| zip_safe=False, | ||
| keywords='ethereum', | ||
| packages=find_packages(exclude=['tests', 'tests.*']), | ||
| keywords="ethereum", | ||
| packages=find_packages(exclude=["tests", "tests.*"]), | ||
| classifiers=[ | ||
| 'Development Status :: 3 - Alpha', | ||
| 'Intended Audience :: Developers', | ||
| 'License :: OSI Approved :: MIT License', | ||
| 'Natural Language :: English', | ||
| 'Programming Language :: Python :: 3', | ||
| 'Programming Language :: Python :: 3.6', | ||
| "Development Status :: 3 - Alpha", | ||
| "Intended Audience :: Developers", | ||
| "License :: OSI Approved :: MIT License", | ||
| "Natural Language :: English", | ||
| "Programming Language :: Python :: 3", | ||
| "Programming Language :: Python :: 3.6", | ||
| ], | ||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this will work when it's installed via a wheel (but I'm not positive) you should confirm before proceeding. Generally this is in the realm of things that I consider bad ideas that don't end up reliably working beyond the development environment.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree it's a little iffy, but isn't this a command that will only be run in a development/testing environment?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is true from what I've read.
I feel the same way, but I guess it's possible other projects might have a core dependency on
ethpm[dev]- which would be weird, but possible. IMO though, this is the cleanest solution I've come across for removing theweb3[tester]splinter from ethpm's core dependencies - and worth the trade-off, but I could be misjudging this.