From f1d12daf39a4c08e94d0f19e3c04db77121e9abf Mon Sep 17 00:00:00 2001 From: fametrano Date: Wed, 1 Feb 2023 11:03:55 +0100 Subject: [PATCH] forced libsecp256k1 and assorted minor fixes --- .pre-commit-config.yaml | 29 ++++++++++++++--------------- pyproject.toml | 2 -- setup.py | 4 ++-- 3 files changed, 16 insertions(+), 19 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b3dfb8c8..4469624e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -39,14 +39,6 @@ repos: - id: copyright-notice args: [--notice=COPYRIGHT] files: python - - repo: https://github.com/asottile/pyupgrade - rev: v3.3.1 - hooks: - - id: pyupgrade - args: [--py37-plus] - # exclude: *fixtures - language: python - types: [python] - repo: https://github.com/PyCQA/autoflake rev: v2.0.0 hooks: @@ -61,6 +53,14 @@ repos: - --remove-rhs-for-unused-variables language: python types: [python] + - repo: https://github.com/asottile/pyupgrade + rev: v3.3.1 + hooks: + - id: pyupgrade + args: [--py37-plus] + # exclude: *fixtures + language: python + types: [python] - repo: https://github.com/pycqa/isort rev: 5.11.4 hooks: @@ -96,6 +96,12 @@ repos: - id: yesqa language: python types: [python] + - repo: https://github.com/PyCQA/flake8 + rev: 6.0.0 + hooks: + - id: flake8 + language: python + types: [python] - repo: https://github.com/psf/black rev: 22.12.0 hooks: @@ -109,12 +115,6 @@ repos: # language_version: python3.11 language: python types: [python] - - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 - hooks: - - id: flake8 - language: python - types: [python] - repo: https://github.com/PyCQA/bandit rev: 1.7.4 hooks: @@ -142,7 +142,6 @@ repos: hooks: - id: pylint args: [ - "--score=false", "--disable=E0401", # import-error ] language: python diff --git a/pyproject.toml b/pyproject.toml index 295267d4..7d3296ce 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -13,8 +13,6 @@ exclude = [ profile = "black" [tool.docformatter] -recursive = true -blank = false in-place = true [tool.pydocstyle] diff --git a/setup.py b/setup.py index 468cdb40..7ea05452 100644 --- a/setup.py +++ b/setup.py @@ -38,8 +38,8 @@ packages=find_packages(exclude=["tests", "tests.*"]), include_package_data=True, # test_suite="btclib.tests", - # install_requires=[], - extras_require={"secp256k1": ["btclib_libsecp256k1==0.1.0"]}, + install_requires=["btclib_libsecp256k1"], + # extras_require={"secp256k1": ["btclib_libsecp256k1"]}, keywords=( "bitcoin cryptography elliptic-curves ecdsa schnorr RFC-6979 " "bip32 bip39 electrum base58 bech32 segwit message-signing "