Let pip-tools handle dependencies

trustlines-protocol · Mar 25, 2020 · 0bb1a07 · 0bb1a07
1 parent 2984bd2
commit 0bb1a07
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 94 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -23,7 +23,7 @@ commands:
           name: Create python venv
           command: |
             python3 -m venv venv
-            venv/bin/pip install -c constraints.txt pip wheel setuptools
+            venv/bin/pip install -c dev-requirements.txt pip wheel setuptools
 
   config-path:
     description: "set environment variables and change PATH"
@@ -40,21 +40,20 @@ jobs:
       - checkout
       - config-path
       - restore_cache:
-          key: venv-{{ checksum "constraints.txt" }}-{{ checksum "setup.cfg" }}
+          key: venv-{{ checksum "dev-requirements.txt" }}-{{ checksum "setup.cfg" }}
       - create-venv
       - run:
           name: Install requirements
           command: |
-            pip install -c constraints.txt -e .[dev]
-            pip uninstall -y contract-deploy-tools
+            pip install -r dev-requirements.txt
       - save_cache:
           key: venv-{{ checksum "constraints.txt" }}-{{ checksum "setup.cfg" }}
           paths:
             - venv
       - run:
           name: Install package
           command: |
-            pip install -c constraints.txt -e .
+            pip install -e .
       - persist_to_workspace:
           root: "~"
           paths:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_language_version:
 
 repos:
 -   repo: https://github.com/psf/black
-    rev: 19.3b0
+    rev: 19.10b0
     hooks:
     - id: black
 

diff --git a/constraints.txt b/constraints.txt
diff --git a/dev-requirements.in b/dev-requirements.in
@@ -0,0 +1,9 @@
+flake8
+mypy
+pytest
+setuptools_scm
+pip>=18.1
+wheel
+setuptools
+black
+pre-commit
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -0,0 +1,89 @@
+#
+# This file is autogenerated by pip-compile
+# To update, run:
+#
+#    pip-compile --allow-unsafe --output-file=dev-requirements.txt dev-requirements.in setup.py
+#
+appdirs==1.4.3            # via black, virtualenv
+attrdict==2.0.1           # via eth-account
+attrs==19.3.0             # via black, jsonschema, pytest
+base58==2.0.0             # via multiaddr
+black==19.10b0            # via -r dev-requirements.in
+blake2b-py==0.1.3         # via py-evm
+cached-property==1.5.1    # via py-evm
+certifi==2019.11.28       # via requests
+cfgv==3.1.0               # via pre-commit
+chardet==3.0.4            # via requests
+click==7.1.1              # via black, contract-deploy-tools (setup.py)
+cytoolz==0.10.1           # via eth-keyfile, eth-utils
+distlib==0.3.0            # via virtualenv
+entrypoints==0.3          # via flake8
+eth-abi==2.1.1            # via eth-account, eth-tester, web3
+eth-account==0.4.0        # via web3
+eth-bloom==1.0.3          # via py-evm
+eth-hash[pycryptodome,pysha3]==0.2.0  # via eth-bloom, eth-tester, eth-utils, trie, web3
+eth-keyfile==0.5.1        # via contract-deploy-tools (setup.py), eth-account
+eth-keys==0.2.4           # via eth-account, eth-keyfile, eth-tester, py-evm
+eth-rlp==0.1.2            # via eth-account
+eth-tester[py-evm]==0.4.0b1  # via contract-deploy-tools (setup.py)
+eth-typing==2.2.1         # via eth-abi, eth-utils, py-ecc, py-evm, web3
+eth-utils==1.8.4          # via contract-deploy-tools (setup.py), eth-abi, eth-account, eth-keyfile, eth-keys, eth-rlp, eth-tester, hexbytes, py-ecc, py-evm, rlp, trie, web3
+filelock==3.0.12          # via virtualenv
+flake8==3.7.9             # via -r dev-requirements.in
+hexbytes==0.2.0           # via eth-account, eth-rlp, web3
+identify==1.4.13          # via pre-commit
+idna==2.9                 # via requests
+importlib-metadata==1.5.0  # via importlib-resources, jsonschema, pluggy, pre-commit, pytest, virtualenv
+importlib-resources==1.4.0  # via pre-commit, virtualenv
+ipfshttpclient==0.4.12    # via web3
+jsonschema==3.2.0         # via web3
+lru-dict==1.1.6           # via py-evm, web3
+mccabe==0.6.1             # via flake8
+more-itertools==8.2.0     # via pytest
+multiaddr==0.0.9          # via ipfshttpclient
+mypy-extensions==0.4.3    # via mypy, py-ecc, py-evm
+mypy==0.770               # via -r dev-requirements.in
+netaddr==0.7.19           # via multiaddr
+nodeenv==1.3.5            # via pre-commit
+packaging==20.3           # via pytest
+parsimonious==0.8.1       # via eth-abi
+pathspec==0.7.0           # via black
+pluggy==0.13.1            # via pytest
+pre-commit==2.2.0         # via -r dev-requirements.in
+protobuf==3.11.3          # via web3
+py-ecc==1.7.1             # via py-evm
+py-evm==0.3.0a11          # via eth-tester
+py-solc==3.2.0            # via contract-deploy-tools (setup.py)
+py==1.8.1                 # via pytest
+pycodestyle==2.5.0        # via flake8
+pycryptodome==3.9.7       # via eth-hash, eth-keyfile
+pyethash==0.1.27          # via py-evm
+pyflakes==2.1.1           # via flake8
+pyparsing==2.4.6          # via packaging
+pyrsistent==0.16.0        # via jsonschema
+pysha3==1.0.2             # via eth-hash
+pytest==5.4.1             # via -r dev-requirements.in
+pyyaml==5.3.1             # via pre-commit
+regex==2020.2.20          # via black
+requests==2.23.0          # via ipfshttpclient, web3
+rlp==1.2.0                # via eth-account, eth-rlp, eth-tester, py-evm, trie
+semantic-version==2.8.4   # via eth-tester, py-solc
+setuptools-scm==3.5.0     # via -r dev-requirements.in
+six==1.14.0               # via attrdict, ipfshttpclient, jsonschema, multiaddr, packaging, parsimonious, protobuf, pyrsistent, virtualenv
+toml==0.10.0              # via black, pre-commit
+toolz==0.10.0             # via cytoolz
+trie==1.4.0               # via py-evm
+typed-ast==1.4.1          # via black, mypy
+typing-extensions==3.7.4.1  # via mypy, web3
+urllib3==1.25.8           # via requests
+varint==1.0.2             # via multiaddr
+virtualenv==20.0.13       # via pre-commit
+wcwidth==0.1.9            # via pytest
+web3==5.7.0               # via contract-deploy-tools (setup.py)
+websockets==8.1           # via web3
+wheel==0.34.2             # via -r dev-requirements.in
+zipp==3.1.0               # via importlib-metadata, importlib-resources
+
+# The following packages are considered to be unsafe in a requirements file:
+pip==20.0.2               # via -r dev-requirements.in
+setuptools==46.1.1        # via -r dev-requirements.in, jsonschema, protobuf
diff --git a/setup.cfg b/setup.cfg
@@ -44,16 +44,6 @@ console_scripts =
 pytest11 =
     deploy-tools=deploy_tools.plugin
 
-[options.extras_require]
-dev =
-    flake8
-    mypy
-    pytest
-    setuptools_scm
-    pip>=18.1
-    black
-    pre-commit
-
 [flake8]
 max-line-length = 120
 ignore =