Skip to content

Commit

Permalink
update configurations
Browse files Browse the repository at this point in the history
  • Loading branch information
@pipermerriam
pipermerriam committed Dec 20, 2018
1 parent 573ae65 commit 8decdd0
Show file tree
Hide file tree
Showing 26 changed files with 51 additions and 2,025 deletions.
215 changes: 18 additions & 197 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,141 +82,28 @@ geth_steps: &geth_steps
key: cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}

jobs:
py35-lint:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-lint
py36-lint:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-lint

py36-docs:
py37-lint:
<<: *common
docker:
- image: circleci/python:3.6
- image: circleci/python:3.7
environment:
TOXENV: py36-docs
TOXENV: py37-lint

py35-native-blockchain-byzantium:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-native-blockchain-byzantium
py35-native-blockchain-constantinople:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-native-blockchain-constantinople
py35-native-blockchain-frontier:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-native-blockchain-frontier
py35-native-blockchain-homestead:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-native-blockchain-homestead
py35-native-blockchain-eip150:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-native-blockchain-eip150
py35-native-blockchain-eip158:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-native-blockchain-eip158
py35-native-blockchain-transition:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-native-blockchain-transition
py35-vm:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-vm
py35-core:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-core
py35-transactions:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-transactions
py35-database:
<<: *common
docker:
- image: circleci/python:3.5
environment:
TOXENV: py35-database

py36-benchmark:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-benchmark
py36-native-blockchain-byzantium:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-native-blockchain-byzantium
py36-native-blockchain-constantinople:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-native-blockchain-constantinople
py36-native-blockchain-frontier:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-native-blockchain-frontier
py36-native-blockchain-homestead:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-native-blockchain-homestead
py36-native-blockchain-eip150:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-native-blockchain-eip150
py36-native-blockchain-eip158:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-native-blockchain-eip158
py36-native-blockchain-transition:
py36-docs:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-native-blockchain-transition
TOXENV: py36-docs

py36-rpc-state-byzantium:
<<: *common
docker:
Expand Down Expand Up @@ -259,92 +146,51 @@ jobs:
- image: circleci/python:3.6
environment:
TOXENV: py36-rpc-blockchain
py36-vm:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-vm

py36-core:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-core
py36-trinity:
py36-integration:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-trinity
py36-trinity-integration:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-trinity-integration
py36-trinity-lightchain_integration:
TOXENV: py36-integration
py36-lightchain_integration:
<<: *geth_steps
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-lightchain_integration
GETH_VERSION: v1.8.1
py36-transactions:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-transactions
py36-p2p:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-p2p
py36-database:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-database
py36-rpc-state-quadratic:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-rpc-state-quadratic
py36-beacon:
<<: *common
docker:
- image: circleci/python:3.6
environment:
TOXENV: py36-beacon

py37-core:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-core
py37-trinity:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-trinity
py37-trinity-integration:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-trinity-integration
py37-beacon:
py37-integration:
<<: *common
docker:
- image: circleci/python:3.7
environment:
TOXENV: py37-beacon
TOXENV: py37-integration

workflows:
version: 2
Expand All @@ -353,47 +199,22 @@ workflows:
- py36-docs

- py37-core
- py37-trinity
- py37-trinity-integration
- py37-beacon
- py37-p2p

- py36-native-blockchain-byzantium
- py36-native-blockchain-constantinople
- py36-native-blockchain-frontier
- py36-native-blockchain-homestead
- py36-native-blockchain-eip150
- py36-native-blockchain-eip158
- py36-native-blockchain-transition
- py36-rpc-state-byzantium
- py36-rpc-state-constantinople
- py36-rpc-state-frontier
- py36-rpc-state-homestead
- py36-rpc-state-eip150
- py36-rpc-state-eip158
- py36-rpc-state-quadratic
- py36-rpc-blockchain
- py36-vm
- py36-benchmark

- py36-core
- py36-trinity
- py36-trinity-integration
- py36-trinity-lightchain_integration
- py36-transactions
- py36-p2p
- py36-database
- py36-rpc-state-quadratic
- py36-beacon

- py35-native-blockchain-byzantium
- py35-native-blockchain-constantinople
- py35-native-blockchain-frontier
- py35-native-blockchain-homestead
- py35-native-blockchain-eip150
- py35-native-blockchain-eip158
- py35-native-blockchain-transition
- py35-vm
- py35-core
- py35-transactions
- py35-database
- py36-integration
- py36-lightchain_integration

- py35-lint
- py36-lint
- py37-lint
8 changes: 0 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,6 @@ release: clean
twine upload dist/*
git config commit.gpgSign "$(CURRENT_SIGN_SETTING)"

release-trinity: clean
CURRENT_SIGN_SETTING=$(git config commit.gpgSign)
git config commit.gpgSign true
git push upstream && git push upstream --tags
python setup_trinity.py sdist bdist_wheel
twine upload dist/*
git config commit.gpgSign "$(CURRENT_SIGN_SETTING)"

create-docker-image: clean
docker build -t ethereum/trinity:latest -t ethereum/trinity:$(version) .

Expand Down
Empty file removed scripts/benchmark/__init__.py
View file
Empty file.
Empty file removed scripts/benchmark/_utils/__init__.py
View file
Empty file.
34 changes: 0 additions & 34 deletions scripts/benchmark/_utils/address.py
View file

This file was deleted.

Loading

0 comments on commit 8decdd0

Please sign in to comment.