Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Vendor ethPM #1379

Merged
merged 10 commits into from
Jul 11, 2019
Merged

Vendor ethPM #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
41ab477
Initial migration of ethpm codebase
njgheorghita Jul 9, 2019
309186c
Add ethpm environment to tox
njgheorghita Jul 9, 2019
8cff826
Move pytest-ethereum code to web3.tools
njgheorghita Jul 9, 2019
b15062c
Fix linting errors
njgheorghita Jul 9, 2019
c6cbb8f
Isort all new files
njgheorghita Jul 9, 2019
faaabd6
Fix import from pytest-ethereum error
njgheorghita Jul 9, 2019
5d18a70
Run local ipfs in background in circle
njgheorghita Jul 9, 2019
968cebd
Move ethpm documentation over to web3 docs
njgheorghita Jul 10, 2019
a7b9846
Remove unused pytest exception
njgheorghita Jul 10, 2019
ea824f1
Move background ipfs node to ethpm only environments in circle
njgheorghita Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,40 @@ geth_steps: &geth_steps
- ~/.py-geth
key: cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}

ethpm_steps: &ethpm_steps
working_directory: ~/repo
steps:
- checkout
- restore_cache:
keys:
- cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
- run:
name: install ipfs
command:
wget https://dist.ipfs.io/go-ipfs/v0.4.19/go-ipfs_v0.4.19_linux-amd64.tar.gz &&
tar xvfz go-ipfs_v0.4.19_linux-amd64.tar.gz &&
sudo cp go-ipfs/ipfs /usr/local/bin &&
ipfs init
- run:
name: start ipfs node in background
command: ipfs daemon
background: true
- run:
name: install dependencies
command: pip install --user tox
- run:
name: run tox
command: ~/.local/bin/tox -r
- save_cache:
paths:
- .tox
- ~/.cache/pip
- ~/.local
- ./eggs
- ~/.ethash
- ~/.py-geth
key: cache-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}


jobs:
#
Expand Down Expand Up @@ -139,6 +173,13 @@ jobs:
environment:
TOXENV: py36-ens

py36-ethpm:
<<: *ethpm_steps
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-ethpm

py36-integration-goethereum-ipc-1.7.2:
<<: *geth_steps
docker:
Expand Down Expand Up @@ -238,6 +279,13 @@ jobs:
environment:
TOXENV: py37-ens

py37-ethpm:
<<: *ethpm_steps
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-ethpm

py37-integration-goethereum-ipc-1.7.2:
<<: *geth_steps
docker:
Expand Down Expand Up @@ -329,6 +377,7 @@ workflows:
- doctest
- py36-core
- py36-ens
- py36-ethpm
- py36-integration-goethereum-ipc-1.7.2
- py36-integration-goethereum-http-1.7.2
- py36-integration-goethereum-ws-1.7.2
Expand All @@ -341,6 +390,7 @@ workflows:
- py36-integration-ethtester-pyevm
- py37-core
- py37-ens
- py37-ethpm
- py37-integration-goethereum-ipc-1.7.2
- py37-integration-goethereum-http-1.7.2
- py37-integration-goethereum-ws-1.7.2
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ test-all:
tox

build-docs:
sphinx-apidoc -o docs/ . setup.py "web3/utils/*" "*conftest*" "tests"
sphinx-apidoc -o docs/ . setup.py "web3/utils/*" "*conftest*" "tests" "ethpm"
$(MAKE) -C docs clean
$(MAKE) -C docs html
$(MAKE) -C docs doctest
Expand Down
Loading