Skip to content

Commit 39fc4dd

Browse files
authored
Remove the trinity and eth modules as well as any related docs, tests, etc. (#1664)
* Remove trinity and p2p modules * add back 37 runs for core and beacon
1 parent 04ad41c commit 39fc4dd

File tree

325 files changed

+37
-31278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

325 files changed

+37
-31278
lines changed

.circleci/config.yml

Lines changed: 2 additions & 143 deletions
Original file line numberDiff line numberDiff line change
@@ -39,48 +39,6 @@ common: &common
3939
- ./eggs
4040
key: cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
4141

42-
geth_steps: &geth_steps
43-
working_directory: ~/repo
44-
steps:
45-
- checkout
46-
- restore_cache:
47-
keys:
48-
- cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
49-
- run:
50-
name: install dependencies
51-
command: pip install --user tox
52-
- run:
53-
name: build geth if missing
54-
command: |
55-
mkdir -p $HOME/.ethash
56-
pip install --user py-geth>=1.10.1
57-
export GOROOT=/usr/local/go
58-
export GETH_BINARY="$HOME/.py-geth/geth-$GETH_VERSION/bin/geth"
59-
if [ ! -e "$GETH_BINARY" ]; then
60-
curl -O https://storage.googleapis.com/golang/go1.7.4.linux-amd64.tar.gz
61-
tar xvf go1.7.4.linux-amd64.tar.gz
62-
sudo chown -R root:root ./go
63-
sudo mv go /usr/local
64-
sudo ln -s /usr/local/go/bin/go /usr/local/bin/go
65-
sudo apt-get update;
66-
sudo apt-get install -y build-essential;
67-
python -m geth.install $GETH_VERSION;
68-
fi
69-
sudo ln -s /home/circleci/.py-geth/geth-$GETH_VERSION/bin/geth /usr/local/bin/geth
70-
geth version
71-
- run:
72-
name: run tox
73-
command: ~/.local/bin/tox -r
74-
- save_cache:
75-
paths:
76-
- .tox
77-
- ~/.cache/pip
78-
- ~/.local
79-
- ./eggs
80-
- ~/.ethash
81-
- ~/.py-geth
82-
key: cache-v1-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "setup.py" }}-{{ checksum "tox.ini" }}
83-
8442
jobs:
8543
py35-lint:
8644
<<: *common
@@ -217,48 +175,6 @@ jobs:
217175
- image: circleci/python:3.6
218176
environment:
219177
TOXENV: py36-native-blockchain-transition
220-
py36-rpc-state-byzantium:
221-
<<: *common
222-
docker:
223-
- image: circleci/python:3.6
224-
environment:
225-
TOXENV: py36-rpc-state-byzantium
226-
py36-rpc-state-constantinople:
227-
<<: *common
228-
docker:
229-
- image: circleci/python:3.6
230-
environment:
231-
TOXENV: py36-rpc-state-constantinople
232-
py36-rpc-state-frontier:
233-
<<: *common
234-
docker:
235-
- image: circleci/python:3.6
236-
environment:
237-
TOXENV: py36-rpc-state-frontier
238-
py36-rpc-state-homestead:
239-
<<: *common
240-
docker:
241-
- image: circleci/python:3.6
242-
environment:
243-
TOXENV: py36-rpc-state-homestead
244-
py36-rpc-state-eip150:
245-
<<: *common
246-
docker:
247-
- image: circleci/python:3.6
248-
environment:
249-
TOXENV: py36-rpc-state-eip150
250-
py36-rpc-state-eip158:
251-
<<: *common
252-
docker:
253-
- image: circleci/python:3.6
254-
environment:
255-
TOXENV: py36-rpc-state-eip158
256-
py36-rpc-blockchain:
257-
<<: *common
258-
docker:
259-
- image: circleci/python:3.6
260-
environment:
261-
TOXENV: py36-rpc-blockchain
262178
py36-vm:
263179
<<: *common
264180
docker:
@@ -271,49 +187,18 @@ jobs:
271187
- image: circleci/python:3.6
272188
environment:
273189
TOXENV: py36-core
274-
py36-trinity:
275-
<<: *common
276-
docker:
277-
- image: circleci/python:3.6
278-
environment:
279-
TOXENV: py36-trinity
280-
py36-trinity-integration:
281-
<<: *common
282-
docker:
283-
- image: circleci/python:3.6
284-
environment:
285-
TOXENV: py36-trinity-integration
286-
py36-trinity-lightchain_integration:
287-
<<: *geth_steps
288-
docker:
289-
- image: circleci/python:3.6
290-
environment:
291-
TOXENV: py36-lightchain_integration
292-
GETH_VERSION: v1.8.1
293190
py36-transactions:
294191
<<: *common
295192
docker:
296193
- image: circleci/python:3.6
297194
environment:
298195
TOXENV: py36-transactions
299-
py36-p2p:
300-
<<: *common
301-
docker:
302-
- image: circleci/python:3.6
303-
environment:
304-
TOXENV: py36-p2p
305196
py36-database:
306197
<<: *common
307198
docker:
308199
- image: circleci/python:3.6
309200
environment:
310201
TOXENV: py36-database
311-
py36-rpc-state-quadratic:
312-
<<: *common
313-
docker:
314-
- image: circleci/python:3.6
315-
environment:
316-
TOXENV: py36-rpc-state-quadratic
317202
py36-beacon:
318203
<<: *common
319204
docker:
@@ -327,18 +212,6 @@ jobs:
327212
- image: circleci/python:3.7
328213
environment:
329214
TOXENV: py37-core
330-
py37-trinity:
331-
<<: *common
332-
docker:
333-
- image: circleci/python:3.7
334-
environment:
335-
TOXENV: py37-trinity
336-
py37-trinity-integration:
337-
<<: *common
338-
docker:
339-
- image: circleci/python:3.7
340-
environment:
341-
TOXENV: py37-trinity-integration
342215
py37-beacon:
343216
<<: *common
344217
docker:
@@ -350,37 +223,23 @@ workflows:
350223
version: 2
351224
test:
352225
jobs:
353-
- py36-docs
354-
355226
- py37-core
356-
- py37-trinity
357-
- py37-trinity-integration
358227
- py37-beacon
359228

229+
- py36-docs
230+
360231
- py36-native-blockchain-byzantium
361232
- py36-native-blockchain-constantinople
362233
- py36-native-blockchain-frontier
363234
- py36-native-blockchain-homestead
364235
- py36-native-blockchain-eip150
365236
- py36-native-blockchain-eip158
366237
- py36-native-blockchain-transition
367-
- py36-rpc-state-byzantium
368-
- py36-rpc-state-constantinople
369-
- py36-rpc-state-frontier
370-
- py36-rpc-state-homestead
371-
- py36-rpc-state-eip150
372-
- py36-rpc-state-eip158
373-
- py36-rpc-blockchain
374238
- py36-vm
375239
- py36-benchmark
376240
- py36-core
377-
- py36-trinity
378-
- py36-trinity-integration
379-
- py36-trinity-lightchain_integration
380241
- py36-transactions
381-
- py36-p2p
382242
- py36-database
383-
- py36-rpc-state-quadratic
384243
- py36-beacon
385244

386245
- py35-native-blockchain-byzantium

.readthedocs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ python:
55
version: 3.6
66
pip_install: True
77
extra_requirements:
8-
- p2p
9-
- trinity
108
- doc

Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

MANIFEST.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ include requirements.txt
55

66
recursive-exclude * __pycache__
77
recursive-exclude * *.py[co]
8-
9-
recursive-include trinity/assets *

Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,6 @@ release: clean
6464
twine upload dist/*
6565
git config commit.gpgSign "$(CURRENT_SIGN_SETTING)"
6666

67-
release-trinity: clean
68-
CURRENT_SIGN_SETTING=$(git config commit.gpgSign)
69-
git config commit.gpgSign true
70-
git push upstream && git push upstream --tags
71-
python setup_trinity.py sdist bdist_wheel
72-
twine upload dist/*
73-
git config commit.gpgSign "$(CURRENT_SIGN_SETTING)"
74-
75-
create-docker-image: clean
76-
docker build -t ethereum/trinity:latest -t ethereum/trinity:$(version) .
77-
7867
sdist: clean
7968
python setup.py sdist bdist_wheel
8069
ls -l dist

docs/api/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ This section aims to provide a detailed description of all APIs. If you are look
1111
:maxdepth: 3
1212
:name: toc-api
1313

14-
trinity/index
1514
eth/index

docs/api/trinity/api.cli.rst

Lines changed: 0 additions & 46 deletions
This file was deleted.

docs/api/trinity/extensibility/api.extensibility.events.rst

Lines changed: 0 additions & 8 deletions
This file was deleted.

docs/api/trinity/extensibility/api.extensibility.exceptions.rst

Lines changed: 0 additions & 9 deletions
This file was deleted.

docs/api/trinity/extensibility/api.extensibility.plugin.rst

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)