Skip to content
This repository has been archived by the owner on Sep 1, 2021. It is now read-only.

Commit

Permalink
Removes/updates legacy dependencies, fixes #122
Browse files Browse the repository at this point in the history
Drops unmaintained pyethereum and pyethapp dependencies.
Replaced by modulars deps eth-abi, eth-account, eth-hash, eth-key,
eth-typing and eth-utils.
Also updated some other requirements to more recent versions.

High level account management is not yet available in eth-account, so
some of pyethapp is imported and adapted to the needs.

Removed duplicated Sentry utils code.

Added `websockets` (dummy) and `distutils` (local copy) modules.
  • Loading branch information
AndreMiras committed Nov 9, 2018
1 parent abec32a commit 89f37b9
Show file tree
Hide file tree
Showing 24 changed files with 939 additions and 218 deletions.
1 change: 0 additions & 1 deletion blacklist.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
lib-dynload/_csv.so
distutils/*
xml/*
pdb.{doc,pyo}
profile.{doc,pyo}
Expand Down
90 changes: 33 additions & 57 deletions buildozer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -38,70 +38,46 @@ version.filename = %(source.dir)s/version.py
# (list) Application requirements
# comma seperated e.g. requirements = sqlite3,kivy
requirements =
hostpython3crystax==3.6,
python3crystax==3.6,
setuptools,
kivy==1.10.1,
plyer==1.3.1,
oscpy==0.3.0,
android,
gevent,
attrdict==2.0.0,
certifi==2018.10.15,
cffi,
https://github.com/AndreMiras/KivyMD/archive/9b2206a.tar.gz,
openssl,
pyelliptic==1.5.7,
asn1crypto==0.24.0,
coincurve==7.1.0,
bitcoin==1.1.42,
devp2p==0.9.3,
pycryptodome==3.4.6,
pbkdf2==1.3,
py-ecc==1.4.2,
pysha3==1.0.2,
pyyaml==3.12,
scrypt==0.8.6,
ethereum==2.1.1,
ptyprocess==0.5.2,
pexpect==4.4.0,
Pygments==2.2.0,
decorator==4.2.1,
ipython-genutils==0.2.0,
traitlets==4.3.2,
ipython==5.5.0,
click==6.7,
pickleshare==0.7.4,
simplegeneric==0.8.1,
wcwidth==0.1.7,
prompt-toolkit==1.0.15,
https://github.com/ethereum/pyethapp/archive/8406f32.zip,
idna==2.6,
typing==3.6.4,
eth-keys==0.2.0b3,
chardet==3.0.4,
cytoolz==0.9.0,
eth-abi==1.2.2,
eth-account==0.3.0,
eth-hash==0.2.0,
eth-keyfile==0.5.1,
rlp==0.6.0,
eth-keys==0.2.0b3,
eth-rlp==0.1.2,
attrdict==2.0.0,
eth-account==0.2.2,
eth-typing==2.0.0,
eth-utils==1.2.1,
gevent,
hexbytes==0.1.0,
hostpython3crystax==3.6,
https://github.com/AndreMiras/garden.layoutmargin/archive/20180517.tar.gz,
https://github.com/AndreMiras/KivyMD/archive/69f3e88.tar.gz,
https://github.com/AndreMiras/pyetheroll/archive/884805b.tar.gz,
https://github.com/corpetty/py-etherscan-api/archive/cb91fb3.tar.gz,
idna==2.7,
kivy==1.10.1,
lru-dict==1.1.5,
web3==4.0.0b11,
certifi==2018.1.18,
chardet==3.0.4,
urllib3==1.22,
requests==2.18.4,
https://github.com/corpetty/py-etherscan-api/archive/cb91fb3.zip,
eth-testrpc==1.3.3,
eth-hash==0.1.1,
pyethash==0.1.27,
cytoolz==0.9.0,
toolz==0.9.0,
eth-abi==1.0.0,
eth-utils==1.0.1,
raven==6.6.0,
openssl,
oscpy==0.3.0,
parsimonious==0.8.1,
plyer==1.3.1,
pycryptodome==3.4.6,
Pygments==2.2.0,
python3crystax==3.6,
qrcode==6.0,
raven==6.9.0,
requests==2.20.0,
requests-cache==0.4.13,
qrcode,
https://github.com/AndreMiras/garden.layoutmargin/archive/20180517.zip,
https://github.com/AndreMiras/pyetheroll/archive/20181031.zip
rlp==1.0.3,
setuptools,
toolz==0.9.0,
urllib3==1.24.1,
web3==4.8.1
# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
Expand Down
31 changes: 12 additions & 19 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,16 @@
web3==4.0.0b11
eth-testrpc==1.3.3
https://github.com/corpetty/py-etherscan-api/archive/cb91fb3.zip#egg=py-etherscan-api
eth-utils==1.2.1
flake8
future
https://github.com/AndreMiras/garden.layoutmargin/archive/20180517.tar.gz#egg=layoutmargin
https://github.com/AndreMiras/KivyMD/archive/69f3e88.tar.gz#egg=kivymd
https://github.com/AndreMiras/pyetheroll/archive/884805b.tar.gz#egg=pyetheroll
https://github.com/corpetty/py-etherscan-api/archive/cb91fb3.tar.gz#egg=py-etherscan-api
isort
Kivy==1.10.1
https://github.com/AndreMiras/KivyMD/archive/9b2206a.tar.gz#egg=kivymd
ethereum==2.1.1
# 2017/10/30 develop
https://github.com/ethereum/pyethapp/archive/8406f32.zip#egg=pyethapp
raven==6.6.0
requests-cache
kivy==1.10.1
kivyunittest==0.1.8
qrcode==5.3
eth-rlp==0.1.2
rlp==0.6.0
# compatible with libcrypto.so.1.1
# https://github.com/golemfactory/golem-messages/pull/112/files
https://github.com/mfranciszkiewicz/pyelliptic/archive/1.5.10.tar.gz#egg=pyelliptic
https://github.com/AndreMiras/garden.layoutmargin/archive/20180517.zip#egg=layoutmargin
plyer==1.3.1
oscpy==0.3.0
https://github.com/AndreMiras/pyetheroll/archive/20181031.zip#egg=pyetheroll
plyer==1.3.1
qrcode==6.0
raven==6.9.0
requests-cache
web3==4.8.1
3 changes: 2 additions & 1 deletion src/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Change Log


## [v20181028]
## [Unreleased]

- Split dedicated Etheroll library, refs #97
- Remove legacy dependencies, refs #112


## [v20181028]
Expand Down
3 changes: 3 additions & 0 deletions src/distutils/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# README

This is being embedded in the repository because python3crystax seems to blacklist it.
Empty file added src/distutils/__init__.py
Empty file.
Loading

0 comments on commit 89f37b9

Please sign in to comment.