mirror of
https://github.com/Chia-Network/chia-blockchain.git
synced 2024-09-11 10:56:14 +03:00
Lower dev dependencies and sync setup.py to dev-reqs.txt (#298)
* Match requirements-dev to setup.py * new flake8 create_plots.py, keys.py * setup-python@v2 - build_macos.sh needs setuptools_scm * Update setuptools_scm, remove isort, autoflake deps * Switch upload-pypi-source to ubuntu from macos
This commit is contained in:
parent
7bc4e36c18
commit
b3ff1c1c51
2
.github/workflows/build-macos.yml
vendored
2
.github/workflows/build-macos.yml
vendored
@ -27,7 +27,7 @@ jobs:
|
||||
# we need fetch-depth 0 so setuptools_scm can resolve tags
|
||||
|
||||
- name: Setup Python environment
|
||||
uses: actions/setup-python@v1.1.1
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
|
||||
|
2
.github/workflows/build-ubuntu.yml
vendored
2
.github/workflows/build-ubuntu.yml
vendored
@ -27,7 +27,7 @@ jobs:
|
||||
# we need fetch-depth 0 so setuptools_scm can resolve tags
|
||||
|
||||
- name: Setup Python environment
|
||||
uses: actions/setup-python@v1.1.1
|
||||
uses: actions/setup-python@v2
|
||||
with:
|
||||
python-version: ${{ matrix.python-version }}
|
||||
|
||||
|
2
.github/workflows/build-windows.yml
vendored
2
.github/workflows/build-windows.yml
vendored
@ -62,7 +62,7 @@ jobs:
|
||||
encoded-value: ${{ secrets.WIN_CODE_SIGN_CERT }}
|
||||
destination-file: .\electron-react\win_code_sign_cert.p12
|
||||
|
||||
- uses: actions/setup-python@v1
|
||||
- uses: actions/setup-python@v2
|
||||
name: Install Python 3.7
|
||||
with:
|
||||
python-version: "3.7"
|
||||
|
4
.github/workflows/upload-pypi-source.yml
vendored
4
.github/workflows/upload-pypi-source.yml
vendored
@ -5,7 +5,7 @@ on: [push, pull_request]
|
||||
jobs:
|
||||
upload_source_dist:
|
||||
name: Upload source distribution
|
||||
runs-on: [macos-latest]
|
||||
runs-on: [ubuntu-latest]
|
||||
|
||||
steps:
|
||||
- name: Cancel previous runs on the same branch
|
||||
@ -19,7 +19,7 @@ jobs:
|
||||
fetch-depth: 0
|
||||
# we need fetch-depth 0 so setuptools_scm can resolve tags
|
||||
|
||||
- uses: actions/setup-python@v1
|
||||
- uses: actions/setup-python@v2
|
||||
name: Install Python
|
||||
with:
|
||||
python-version: '3.7'
|
||||
|
@ -1,5 +1,5 @@
|
||||
#!/bin/bash
|
||||
|
||||
pip install setuptools_scm
|
||||
# The environment variable CHIA_INSTALLER_VERSION needs to be defined
|
||||
CHIA_INSTALLER_VERSION=$(python installer-version.py)
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
[build-system]
|
||||
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=3.5.0"]
|
||||
requires = ["setuptools>=42", "wheel", "setuptools_scm[toml]>=4.1.2"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
|
||||
[tool.setuptools_scm]
|
||||
|
@ -1,33 +1,33 @@
|
||||
Click==7.0
|
||||
appdirs==1.4.3
|
||||
autoflake==1.3.1
|
||||
black==19.10b0
|
||||
cffi==1.13.2
|
||||
entrypoints==0.3
|
||||
flake8==3.8.3
|
||||
idna==2.8
|
||||
importlib-metadata==1.4.0
|
||||
isort==4.3.21
|
||||
mccabe==0.6.1
|
||||
more-itertools==8.1.0
|
||||
multidict==4.7.4
|
||||
mypy-extensions==0.4.3
|
||||
mypy==0.782
|
||||
packaging==20.4
|
||||
pathspec==0.7.0
|
||||
pluggy==0.13.1
|
||||
py==1.8.1
|
||||
pycodestyle==2.5.0
|
||||
pycparser==2.19
|
||||
pyflakes==2.1.1
|
||||
pyparsing==2.4.6
|
||||
pytest-asyncio==0.14.0
|
||||
pytest==5.4.3
|
||||
regex==2020.1.8
|
||||
setuptools-scm==4.1.2
|
||||
six==1.14.0
|
||||
toml==0.10.0
|
||||
typed-ast==1.4.1
|
||||
typing-extensions==3.7.4.1
|
||||
wcwidth==0.1.8
|
||||
zipp==2.0.0
|
||||
black>=19.10b0
|
||||
# black Dependencies
|
||||
appdirs
|
||||
attrs>=18.1.0
|
||||
click>=6.5
|
||||
mypy_extensions>=0.4.3
|
||||
pathspec>=0.6, <1
|
||||
regex>=2020.1.8
|
||||
toml>=0.9.4
|
||||
typed-ast>=1.4.1
|
||||
typing_extensions>=3.7.4
|
||||
|
||||
flake8>=3.8.3
|
||||
# flake8 Dependencies
|
||||
pyflakes >= 2.2.0
|
||||
pycodestyle >= 2.6.0a1
|
||||
mccabe >= 0.6.0
|
||||
importlib-metadata
|
||||
|
||||
mypy>=0.782
|
||||
# mypy Dependencies
|
||||
mypy_extensions >= 0.4.3
|
||||
# typed_ast >= 1.4.1
|
||||
typing_extensions>=3.7.4
|
||||
|
||||
pytest>=5.4.3
|
||||
# No Dependencies
|
||||
|
||||
pytest-asyncio>=0.14.0
|
||||
# No Dependencies
|
||||
|
||||
setuptools_scm>=4.1.2
|
||||
# No Dependencies
|
||||
|
6
setup.py
6
setup.py
@ -9,8 +9,8 @@ dependencies = [
|
||||
"chiapos==0.12.22", # proof of space
|
||||
"clvm==0.4", # contract language
|
||||
"clvm-tools==0.1.1", # clvm compiler tools
|
||||
"aiosqlite==0.13.0", # asyncio wrapper for sqlite, to store blocks
|
||||
"aiohttp==3.6.2", # HTTP server for full node rpc
|
||||
"aiosqlite==0.13.0", # asyncio wrapper for sqlite, to store blocks
|
||||
"bitstring==3.1.7", # Binary data management library
|
||||
"cbor2==5.1.0", # Used for network wire format
|
||||
"colorlog==4.1.0", # Adds color to logs
|
||||
@ -28,12 +28,10 @@ upnp_dependencies = [
|
||||
]
|
||||
dev_dependencies = [
|
||||
"pytest",
|
||||
"pytest-asyncio",
|
||||
"flake8",
|
||||
"mypy",
|
||||
"isort",
|
||||
"autoflake",
|
||||
"black",
|
||||
"pytest-asyncio",
|
||||
]
|
||||
|
||||
kwargs = dict(
|
||||
|
@ -77,9 +77,9 @@ def main():
|
||||
|
||||
if args.sk_seed is None and args.index is not None:
|
||||
log(
|
||||
f"You have specified the -i (index) argument without the -s (sk_seed) argument."
|
||||
f" The program has changes, so that the sk_seed is now generated randomly, so -i is no longer necessary."
|
||||
f" Please run the program without -i."
|
||||
"You have specified the -i (index) argument without the -s (sk_seed) argument."
|
||||
" The program has changes, so that the sk_seed is now generated randomly, so -i is no longer necessary."
|
||||
" Please run the program without -i."
|
||||
)
|
||||
quit()
|
||||
|
||||
|
@ -24,18 +24,18 @@ def help_message():
|
||||
print("usage: chia keys command")
|
||||
print(f"command can be any of {command_list}")
|
||||
print("")
|
||||
print(f"chia keys generate (generates and adds a key to keychain)")
|
||||
print(f"chia keys generate_and_print (generates but does NOT add to keychain)")
|
||||
print(f"chia keys show (displays all the keys in keychain)")
|
||||
print(f"chia keys add_seed -m [24 words] (add a private key through the mnemonic)")
|
||||
print(f"chia keys add -k [extended key] (add an extended private key in hex form)")
|
||||
print("chia keys generate (generates and adds a key to keychain)")
|
||||
print("chia keys generate_and_print (generates but does NOT add to keychain)")
|
||||
print("chia keys show (displays all the keys in keychain)")
|
||||
print("chia keys add_seed -m [24 words] (add a private key through the mnemonic)")
|
||||
print("chia keys add -k [extended key] (add an extended private key in hex form)")
|
||||
print(
|
||||
f"chia keys add_not_extended -k [key] (add a not extended private key in hex form)"
|
||||
"chia keys add_not_extended -k [key] (add a not extended private key in hex form)"
|
||||
)
|
||||
print(
|
||||
f"chia keys delete -f [fingerprint] (delete a key by it's pk fingerprint in hex form)"
|
||||
"chia keys delete -f [fingerprint] (delete a key by it's pk fingerprint in hex form)"
|
||||
)
|
||||
print(f"chia keys delete_all (delete all private keys in keychain)")
|
||||
print("chia keys delete_all (delete all private keys in keychain)")
|
||||
|
||||
|
||||
def make_parser(parser):
|
||||
|
Loading…
Reference in New Issue
Block a user