diff --git a/requirements_test.txt b/requirements_test.txt index 89773ee7..4f604782 100644 --- a/requirements_test.txt +++ b/requirements_test.txt @@ -1,7 +1,6 @@ -parso<0.8.0 -pytest>=4.2.1,<5 +pytest>=4.2.1,<7 pytest-cov>=2.6.1,<3 -pytest-xdist>=1.26.1,<2 +pytest-xdist>=1.26.1,<3 mypy>=0.670,<1 codecov>=2.0,<3 -hypothesis>=5.5.4 +hypothesis>=5.5.4,<7 diff --git a/requirements_tools.txt b/requirements_tools.txt index 46427684..eb9e731a 100644 --- a/requirements_tools.txt +++ b/requirements_tools.txt @@ -1,4 +1,3 @@ shap>=0.31.0,<=0.34 swifter>=0.284,<0.300 distributed>=2.14.0,<2.17.0 -parso<0.8.0,>=0.7.0 diff --git a/scripts/create_venv.sh b/scripts/create_venv.sh index 2d554546..c5dd62ca 100644 --- a/scripts/create_venv.sh +++ b/scripts/create_venv.sh @@ -2,4 +2,11 @@ set -e +cur_dir=$(dirname ${BASH_SOURCE[0]}) +source $cur_dir/helpers.sh + /usr/local/bin/python3 -m venv venv + +activate_venv + +venv/bin/python3 -m pip install -q 'setuptools==51.3.3' diff --git a/scripts/helpers.sh b/scripts/helpers.sh index f74f79db..d7f1d81d 100644 --- a/scripts/helpers.sh +++ b/scripts/helpers.sh @@ -2,11 +2,11 @@ set -e -activate_venv(){ - . venv/bin/activate +activate_venv() { + . venv/bin/activate } -install_package(){ +install_package() { activate_venv venv/bin/python3 -m pip install -qe .$1 } diff --git a/scripts/init_pypirc.sh b/scripts/init_pypirc.sh index c16fb69d..e29ec7bc 100644 --- a/scripts/init_pypirc.sh +++ b/scripts/init_pypirc.sh @@ -2,6 +2,6 @@ set -e -echo -e "[pypi]" >> ~/.pypirc -echo -e "username = $PYPI_USER" >> ~/.pypirc -echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc +echo -e "[pypi]" >>~/.pypirc +echo -e "username = $PYPI_USER" >>~/.pypirc +echo -e "password = $PYPI_PASSWORD" >>~/.pypirc diff --git a/scripts/lint.sh b/scripts/lint.sh index 7a3db623..6592081b 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -7,12 +7,12 @@ source $cur_dir/helpers.sh activate_venv -venv/bin/python3 -m pip install -q flake8==3.8.0 +venv/bin/python3 -m pip install -q flake8==3.8.4 venv/bin/python3 -m flake8 \ ---ignore=E731,W503 \ ---filename=*.py \ ---exclude=__init__.py \ ---show-source \ ---statistics \ ---max-line-length=120 \ -src/ tests/ + --ignore=E731,W503 \ + --filename=*.py \ + --exclude=__init__.py \ + --show-source \ + --statistics \ + --max-line-length=120 \ + src/ tests/