Only use `setup.py`
This commit is contained in:
parent
02e6d5b46c
commit
97906a6339
|
@ -61,13 +61,13 @@ jobs:
|
||||||
key: v1-specs-repo-{{ .Branch }}-{{ .Revision }}
|
key: v1-specs-repo-{{ .Branch }}-{{ .Revision }}
|
||||||
- restore_cached_venv:
|
- restore_cached_venv:
|
||||||
venv_name: v1-pyspec
|
venv_name: v1-pyspec
|
||||||
reqs_checksum: '{{ checksum "test_libs/pyspec/requirements.txt" }}-{{ checksum "test_libs/pyspec/requirements-testing.txt" }}'
|
reqs_checksum: '{{ checksum "test_libs/pyspec/setup.py" }}'
|
||||||
- run:
|
- run:
|
||||||
name: Install pyspec requirements
|
name: Install pyspec requirements
|
||||||
command: make install_test
|
command: make install_test
|
||||||
- save_cached_venv:
|
- save_cached_venv:
|
||||||
venv_name: v1-pyspec
|
venv_name: v1-pyspec
|
||||||
reqs_checksum: '{{ checksum "test_libs/pyspec/requirements.txt" }}-{{ checksum "test_libs/pyspec/requirements-testing.txt" }}'
|
reqs_checksum: '{{ checksum "test_libs/pyspec/setup.py" }}'
|
||||||
venv_path: ./test_libs/pyspec/venv
|
venv_path: ./test_libs/pyspec/venv
|
||||||
test:
|
test:
|
||||||
docker:
|
docker:
|
||||||
|
@ -78,7 +78,7 @@ jobs:
|
||||||
key: v1-specs-repo-{{ .Branch }}-{{ .Revision }}
|
key: v1-specs-repo-{{ .Branch }}-{{ .Revision }}
|
||||||
- restore_cached_venv:
|
- restore_cached_venv:
|
||||||
venv_name: v1-pyspec
|
venv_name: v1-pyspec
|
||||||
reqs_checksum: '{{ checksum "test_libs/pyspec/requirements.txt" }}-{{ checksum "test_libs/pyspec/requirements-testing.txt" }}'
|
reqs_checksum: '{{ checksum "test_libs/pyspec/setup.py" }}'
|
||||||
- run:
|
- run:
|
||||||
name: Run py-tests
|
name: Run py-tests
|
||||||
command: make citest
|
command: make citest
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -31,7 +31,7 @@ gen_yaml_tests: $(PY_SPEC_ALL_TARGETS) $(YAML_TEST_TARGETS)
|
||||||
|
|
||||||
# installs the packages to run pyspec tests
|
# installs the packages to run pyspec tests
|
||||||
install_test:
|
install_test:
|
||||||
cd $(PY_SPEC_DIR); python3 -m venv venv; . venv/bin/activate; pip3 install -r requirements-testing.txt;
|
cd $(PY_SPEC_DIR); python3 -m venv venv; . venv/bin/activate; pip3 install -e .[dev];
|
||||||
|
|
||||||
test: $(PY_SPEC_ALL_TARGETS)
|
test: $(PY_SPEC_ALL_TARGETS)
|
||||||
cd $(PY_SPEC_DIR); . venv/bin/activate; python -m pytest .
|
cd $(PY_SPEC_DIR); . venv/bin/activate; python -m pytest .
|
||||||
|
|
|
@ -72,7 +72,7 @@ Note: make sure to run `make pyspec` from the root of the specs repository, to b
|
||||||
|
|
||||||
Install all the necessary requirements (re-run when you add more):
|
Install all the necessary requirements (re-run when you add more):
|
||||||
```bash
|
```bash
|
||||||
pip3 install -r requirements.txt
|
pip3 install -e .[pyspec]
|
||||||
```
|
```
|
||||||
|
|
||||||
And write your initial test generator, extending the base generator:
|
And write your initial test generator, extending the base generator:
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
ruamel.yaml==0.15.87
|
|
|
@ -1,9 +1,18 @@
|
||||||
from distutils.core import setup
|
from distutils.core import setup
|
||||||
|
|
||||||
|
|
||||||
|
deps = {
|
||||||
|
'config_helpers': [
|
||||||
|
"ruamel.yaml==0.15.87",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
deps['dev'] = (
|
||||||
|
deps['config_helpers']
|
||||||
|
)
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='config_helpers',
|
name='config_helpers',
|
||||||
packages=['preset_loader'],
|
packages=['preset_loader'],
|
||||||
install_requires=[
|
install_requires=deps['config_helpers']
|
||||||
"ruamel.yaml==0.15.87"
|
|
||||||
]
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
ruamel.yaml==0.15.87
|
|
||||||
eth-utils==1.4.1
|
|
|
@ -1,10 +1,20 @@
|
||||||
from distutils.core import setup
|
from distutils.core import setup
|
||||||
|
|
||||||
|
|
||||||
|
deps = {
|
||||||
|
'gen_helpers': [
|
||||||
|
"ruamel.yaml==0.15.87",
|
||||||
|
"eth-utils==1.4.1",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
deps['dev'] = (
|
||||||
|
deps['gen_helpers']
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='gen_helpers',
|
name='gen_helpers',
|
||||||
packages=['gen_base'],
|
packages=['gen_base'],
|
||||||
install_requires=[
|
install_requires=deps['gen_helpers'],
|
||||||
"ruamel.yaml==0.15.87",
|
|
||||||
"eth-utils==1.4.1"
|
|
||||||
]
|
|
||||||
)
|
)
|
||||||
|
|
|
@ -38,7 +38,7 @@ Install dependencies:
|
||||||
```bash
|
```bash
|
||||||
python3 -m venv venv
|
python3 -m venv venv
|
||||||
. venv/bin/activate
|
. venv/bin/activate
|
||||||
pip3 install -r requirements-testing.txt
|
pip3 install -e .[dev]
|
||||||
```
|
```
|
||||||
Note: make sure to run `make -B pyspec` from the root of the specs repository,
|
Note: make sure to run `make -B pyspec` from the root of the specs repository,
|
||||||
to build the parts of the pyspec module derived from the markdown specs.
|
to build the parts of the pyspec module derived from the markdown specs.
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
-r requirements.txt
|
|
||||||
pytest>=3.6,<3.7
|
|
||||||
../config_helpers
|
|
|
@ -1,4 +0,0 @@
|
||||||
eth-utils>=1.3.0,<2
|
|
||||||
eth-typing>=2.1.0,<3.0.0
|
|
||||||
pycryptodome==3.7.3
|
|
||||||
py_ecc>=1.6.0
|
|
|
@ -1,13 +1,30 @@
|
||||||
from setuptools import setup, find_packages
|
from setuptools import setup, find_packages
|
||||||
|
|
||||||
setup(
|
|
||||||
name='pyspec',
|
|
||||||
packages=find_packages(),
|
|
||||||
tests_require=["pytest"],
|
deps = {
|
||||||
install_requires=[
|
'pyspec': [
|
||||||
"eth-utils>=1.3.0,<2",
|
"eth-utils>=1.3.0,<2",
|
||||||
"eth-typing>=2.1.0,<3.0.0",
|
"eth-typing>=2.1.0,<3.0.0",
|
||||||
"pycryptodome==3.7.3",
|
"pycryptodome==3.7.3",
|
||||||
"py_ecc>=1.6.0",
|
"py_ecc>=1.6.0",
|
||||||
]
|
],
|
||||||
|
'test': [
|
||||||
|
"pytest>=3.6,<3.7",
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
deps['dev'] = (
|
||||||
|
deps['pyspec'] +
|
||||||
|
deps['test']
|
||||||
|
)
|
||||||
|
|
||||||
|
install_requires = deps['pyspec']
|
||||||
|
|
||||||
|
setup(
|
||||||
|
name='pyspec',
|
||||||
|
packages=find_packages(),
|
||||||
|
install_requires=install_requires,
|
||||||
|
extras_require=deps,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue