diff --git a/Dockerfile b/Dockerfile index 1f7608e24..4ef76b03e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,7 @@ WORKDIR /code/ RUN pip install virtualenv==16.2.0 RUN pip install tox==2.9.1 +COPY requirements-indirect.txt . COPY requirements.txt . COPY requirements-dev.txt . COPY .pre-commit-config.yaml . diff --git a/MANIFEST.in b/MANIFEST.in index fca685eaa..313b4e008 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,5 +1,6 @@ include Dockerfile include LICENSE +include requirements-indirect.txt include requirements.txt include requirements-dev.txt include tox.ini diff --git a/requirements-indirect.txt b/requirements-indirect.txt new file mode 100644 index 000000000..d92b4e708 --- /dev/null +++ b/requirements-indirect.txt @@ -0,0 +1,28 @@ +altgraph==0.17 +appdirs==1.4.4 +attrs==19.3.0 +bcrypt==3.1.7 +cffi==1.14.0 +cryptography==2.9.2 +distlib==0.3.0 +entrypoints==0.3 +filelock==3.0.12 +gitdb2==2.0.6 +mccabe==0.6.1 +more-itertools==8.3.0; python_version >= '3.5' +more-itertools==5.0.0; python_version < '3.5' +packaging==20.4 +pluggy==0.13.1 +py==1.8.1 +pycodestyle==2.5.0 +pycparser==2.20 +pyflakes==2.1.1 +PyNaCl==1.3.0 +pyparsing==2.4.7 +pyrsistent==0.16.0 +smmap==3.0.4 +smmap2==3.0.1 +toml==0.10.1 +tox==2.9.1 +virtualenv==16.2.0 +wcwidth==0.1.9 diff --git a/requirements.txt b/requirements.txt index e64731272..7cc8edbea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -25,5 +25,4 @@ six==1.12.0 subprocess32==3.5.4; python_version < '3.2' texttable==1.6.2 urllib3==1.25.9; python_version == '3.3' -wcwidth==0.1.9 websocket-client==0.57.0 diff --git a/script/build/osx b/script/build/osx index 66868756b..e2d17527b 100755 --- a/script/build/osx +++ b/script/build/osx @@ -6,6 +6,7 @@ TOOLCHAIN_PATH="$(realpath $(dirname $0)/../../build/toolchain)" rm -rf venv virtualenv -p "${TOOLCHAIN_PATH}"/bin/python3 venv +venv/bin/pip install -r requirements-indirect.txt venv/bin/pip install -r requirements.txt venv/bin/pip install -r requirements-build.txt venv/bin/pip install --no-deps . diff --git a/script/build/windows.ps1 b/script/build/windows.ps1 index 7ba5ebde2..472b31ca1 100644 --- a/script/build/windows.ps1 +++ b/script/build/windows.ps1 @@ -45,6 +45,7 @@ virtualenv -p C:\Python37\python.exe .\venv $ErrorActionPreference = "Continue" .\venv\Scripts\pip install pypiwin32==223 +.\venv\Scripts\pip install -r requirements-indirect.txt .\venv\Scripts\pip install -r requirements.txt .\venv\Scripts\pip install --no-deps . .\venv\Scripts\pip install -r requirements-build.txt diff --git a/tox.ini b/tox.ini index 5f57cfb11..111d7e618 100644 --- a/tox.ini +++ b/tox.ini @@ -15,6 +15,7 @@ passenv = setenv = HOME=/tmp deps = + -rrequirements-indirect.txt -rrequirements.txt -rrequirements-dev.txt commands =