diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index a4701d9b744a..65a69da49ab7 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -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 }} diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index b16f17bf8bdc..a13af750ec34 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -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 }} diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index f8f6712648cf..4f299ef2f679 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -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" diff --git a/.github/workflows/upload-pypi-source.yml b/.github/workflows/upload-pypi-source.yml index 4e86e53bc0b8..359e3ce38867 100644 --- a/.github/workflows/upload-pypi-source.yml +++ b/.github/workflows/upload-pypi-source.yml @@ -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 @@ -18,8 +18,8 @@ jobs: with: 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' diff --git a/build_scripts/build_macos.sh b/build_scripts/build_macos.sh index e5cabf47a2b5..390e273b598a 100644 --- a/build_scripts/build_macos.sh +++ b/build_scripts/build_macos.sh @@ -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) diff --git a/pyproject.toml b/pyproject.toml index 5e59761bbe59..48d493a6c2dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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] diff --git a/requirements-dev.txt b/requirements-dev.txt index 6002669155d6..64d54999c4ff 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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 diff --git a/setup.py b/setup.py index e197502db105..258ed665deb8 100644 --- a/setup.py +++ b/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( diff --git a/src/cmds/create_plots.py b/src/cmds/create_plots.py index 2790c8d41f49..f03b717814c0 100644 --- a/src/cmds/create_plots.py +++ b/src/cmds/create_plots.py @@ -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() diff --git a/src/cmds/keys.py b/src/cmds/keys.py index 298eeace2c8d..934982fd76dc 100644 --- a/src/cmds/keys.py +++ b/src/cmds/keys.py @@ -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):