Skip to content
This repository was archived by the owner on May 23, 2023. It is now read-only.

Commit 58cc2ed

Browse files
committed
cleanup of setup scripts
1 parent 5c3d26f commit 58cc2ed

File tree

4 files changed

+11
-25
lines changed

4 files changed

+11
-25
lines changed

MANIFEST.in

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,2 @@
1-
include tests/*.txt
21
include requirements.txt
32
include dev_requirements.txt
4-
include features/*.feature
5-
include features/steps/*.py
6-
include versioneer.py
7-
include pyethereum/_version.py

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ clean-test:
3232
rm -fr htmlcov/
3333

3434
lint:
35-
flake8 pyethereum tests --ignore=E501
35+
flake8 ethereum tests --ignore=E501
3636

3737
test:
3838
python setup.py test
@@ -41,15 +41,14 @@ test-all:
4141
tox
4242

4343
coverage:
44-
coverage run --source pyethereum setup.py test
44+
coverage run --source ethereum setup.py test
4545
coverage report -m
4646
coverage html
4747
open htmlcov/index.html
4848

4949
release: clean
5050
python setup.py sdist upload
5151
python setup.py bdist_wheel upload
52-
echo 'failed? create a clean version first, e.g.: git tag 0.6.31'
5352

5453
dist: clean
5554
python setup.py sdist

requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
bitcoin
2-
bottle
3-
docopt
42
ethereum-serpent
53
leveldb
6-
miniupnpc
74
pysha3
85
pytest
96
pytest-timeout

setup.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,33 @@
11
from setuptools import setup, find_packages
2-
import versioneer
3-
versioneer.VCS = 'git'
4-
versioneer.versionfile_source = 'pyethereum/_version.py'
5-
versioneer.versionfile_build = 'pyethereum/_version.py'
6-
versioneer.tag_prefix = '' # tags are like 1.2.0
7-
versioneer.parentdir_prefix = 'pyethereum-' # dirname like 'myproject-1.2.0'
82

93
from setuptools.command.test import test as TestCommand
4+
5+
106
class PyTest(TestCommand):
7+
118
def finalize_options(self):
129
TestCommand.finalize_options(self)
1310
self.test_args = []
1411
self.test_suite = True
12+
1513
def run_tests(self):
16-
#import here, cause outside the eggs aren't loaded
14+
# import here, cause outside the eggs aren't loaded
1715
import pytest
1816
pytest.main(self.test_args)
1917

2018

21-
console_scripts = ['pyeth=pyethereum.eth:main',
22-
'pyethclient=pyethereum.ethclient:main']
23-
19+
console_scripts = []
2420

25-
cmdclass=versioneer.get_cmdclass()
26-
cmdclass['test'] = PyTest
21+
cmdclass = dict(test=PyTest)
2722

2823
install_requires = [x.strip() for x in open('requirements.txt')]
2924

30-
setup(name="pyethereum",
25+
setup(name="ethereum",
3126
packages=find_packages("."),
3227
description='Next generation cryptocurrency network',
3328
url='https://github.com/ethereum/pyethereum/',
3429
install_requires=install_requires,
3530
entry_points=dict(console_scripts=console_scripts),
36-
version=versioneer.get_version(),
31+
version='0.9.60',
3732
cmdclass=cmdclass
3833
)

0 commit comments

Comments
 (0)