From b1874dc18b6cd7cc65dd52ce4f9b9c8e9ad14f3c Mon Sep 17 00:00:00 2001
From: Hsiao-Wei Wang <hwwang156@gmail.com>
Date: Tue, 23 Apr 2019 10:39:52 +0800
Subject: [PATCH] Update Makefile and CI setting

1. Move .venv to TEST_LIBS_DIR/
2. Install `config_helpers` separately
---
 .circleci/config.yml |  8 ++++----
 Makefile             | 14 ++++++++++----
 test_libs/setup.py   | 29 +++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 8 deletions(-)
 create mode 100644 test_libs/setup.py

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 28d949de4..41e809207 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -60,15 +60,15 @@ jobs:
       - restore_cache:
           key: v1-specs-repo-{{ .Branch }}-{{ .Revision }}
       - restore_cached_venv:
-          venv_name: v1-pyspec
+          venv_name: v1-test_libs
           reqs_checksum: '{{ checksum "test_libs/pyspec/setup.py" }}'
       - run:
           name: Install pyspec requirements
           command: make install_test
       - save_cached_venv:
-          venv_name: v1-pyspec
+          venv_name: v1-test_libs
           reqs_checksum: '{{ checksum "test_libs/pyspec/setup.py" }}'
-          venv_path: ./test_libs/pyspec/venv
+          venv_path: ./test_libs/venv
   test:
     docker:
       - image: circleci/python:3.6
@@ -77,7 +77,7 @@ jobs:
       - restore_cache:
           key: v1-specs-repo-{{ .Branch }}-{{ .Revision }}
       - restore_cached_venv:
-          venv_name: v1-pyspec
+          venv_name: v1-test_libs
           reqs_checksum: '{{ checksum "test_libs/pyspec/setup.py" }}'
       - run:
           name: Run py-tests
diff --git a/Makefile b/Makefile
index 10550750a..135124898 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ SPEC_DIR = ./specs
 SCRIPT_DIR = ./scripts
 TEST_LIBS_DIR = ./test_libs
 PY_SPEC_DIR = $(TEST_LIBS_DIR)/pyspec
+CONFIG_HELPERS_DIR = $(TEST_LIBS_DIR)/config_helpers
 YAML_TEST_DIR = ./eth2.0-spec-tests/tests
 GENERATOR_DIR = ./test_generators
 CONFIGS_DIR = ./configs
@@ -23,7 +24,8 @@ all: $(PY_SPEC_ALL_TARGETS) $(YAML_TEST_DIR) $(YAML_TEST_TARGETS)
 clean:
 	rm -rf $(YAML_TEST_DIR)
 	rm -rf $(GENERATOR_VENVS)
-	rm -rf $(PY_SPEC_DIR)/venv $(PY_SPEC_DIR)/.pytest_cache
+	rm -rf $(TEST_LIBS_DIR)/venv
+	rm -rf $(PY_SPEC_DIR)/.pytest_cache
 	rm -rf $(PY_SPEC_ALL_TARGETS)
 
 # "make gen_yaml_tests" to run generators
@@ -31,13 +33,17 @@ gen_yaml_tests: $(PY_SPEC_ALL_TARGETS) $(YAML_TEST_TARGETS)
 
 # installs the packages to run pyspec tests
 install_test:
-	cd $(PY_SPEC_DIR); python3 -m venv venv; . venv/bin/activate; pip3 install -e .[dev];
+	cd $(TEST_LIBS_DIR); python3 -m venv venv; . venv/bin/activate; \
+	cd ..; cd $(CONFIG_HELPERS_DIR); pip3 install -e .; \
+	cd ../..; cd $(PY_SPEC_DIR); pip3 install -e .[dev];
 
 test: $(PY_SPEC_ALL_TARGETS)
-	cd $(PY_SPEC_DIR); . venv/bin/activate; python -m pytest .
+	cd $(TEST_LIBS_DIR); . venv/bin/activate; \
+	cd ..; cd $(PY_SPEC_DIR); python -m pytest .;
 
 citest: $(PY_SPEC_ALL_TARGETS)
-	cd $(PY_SPEC_DIR); mkdir -p test-reports/eth2spec; . venv/bin/activate; python -m pytest --junitxml=test-reports/eth2spec/test_results.xml .
+	cd $(TEST_LIBS_DIR); . venv/bin/activate; \
+	cd ..; cd $(PY_SPEC_DIR); mkdir -p test-reports/eth2spec; python -m pytest --junitxml=test-reports/eth2spec/test_results.xml .
 
 # "make pyspec" to create the pyspec for all phases.
 pyspec: $(PY_SPEC_ALL_TARGETS)
diff --git a/test_libs/setup.py b/test_libs/setup.py
new file mode 100644
index 000000000..b82fc369c
--- /dev/null
+++ b/test_libs/setup.py
@@ -0,0 +1,29 @@
+from setuptools import setup, find_packages
+
+
+deps = {
+    'pyspec': [
+        "eth-utils>=1.3.0,<2",
+        "eth-typing>=2.1.0,<3.0.0",
+        "pycryptodome==3.7.3",
+        "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(exclude=["tests", "tests.*"]),
+    install_requires=install_requires,
+    extras_require=deps,
+)