From 25e1b78eedd76033bc86e98e535e0e72d59ad290 Mon Sep 17 00:00:00 2001 From: Amog Kamsetty Date: Fri, 22 Jan 2021 16:29:05 -0800 Subject: [PATCH] [Dependencies] Move requirements.txt to requirements directory. (#13636) --- .github/dependabot.yml | 12 ++++++++++++ ci/travis/install-dependencies.sh | 2 +- python/{ => requirements}/requirements.txt | 0 python/requirements/requirements_tune.in | 2 +- python/setup.py | 4 ++-- 5 files changed, 16 insertions(+), 4 deletions(-) rename python/{ => requirements}/requirements.txt (100%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9f8b6b7a7..3074b6042 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,3 +21,15 @@ updates: open-pull-requests-limit: 3 reviewers: - "ray-project/ray-tune" + ignore: + # Ignore pinned dependencies in requirements.txt. + - dependency-name: aiohttp + - dependency-name: msgpack + - dependency-name: opencv-python-headless + - dependency-name: pandas + - dependency-name: scipy + - dependency-name: pydantic + - dependency-name: cython + - dependency-name: llmvlite + - dependency-name: pytest + - dependency-name: scikit-learn diff --git a/ci/travis/install-dependencies.sh b/ci/travis/install-dependencies.sh index 8c42f694c..96f4fa95a 100755 --- a/ci/travis/install-dependencies.sh +++ b/ci/travis/install-dependencies.sh @@ -274,7 +274,7 @@ install_dependencies() { local status="0"; local errmsg=""; for _ in {1..3}; do - errmsg=$(CC=gcc pip install -r "${WORKSPACE_DIR}"/python/requirements.txt 2>&1) && break; + errmsg=$(CC=gcc pip install -r "${WORKSPACE_DIR}"/python/requirements/requirements.txt 2>&1) && break; status=$errmsg && echo "'pip install ...' failed, will retry after n seconds!" && sleep 30; done if [ "$status" != "0" ]; then diff --git a/python/requirements.txt b/python/requirements/requirements.txt similarity index 100% rename from python/requirements.txt rename to python/requirements/requirements.txt diff --git a/python/requirements/requirements_tune.in b/python/requirements/requirements_tune.in index 40ccf4be4..9bb83cbee 100644 --- a/python/requirements/requirements_tune.in +++ b/python/requirements/requirements_tune.in @@ -1,5 +1,5 @@ # Use base requirements to constrain these requirements. --c ../requirements.txt +-c ./requirements.txt ax-platform==0.1.9; python_version < '3.7' ax-platform==0.1.19; python_version >= '3.7' diff --git a/python/setup.py b/python/setup.py index 18d012b99..a1542a7a2 100644 --- a/python/setup.py +++ b/python/setup.py @@ -92,7 +92,7 @@ ray_files += [ ] # If you're adding dependencies for ray extras, please -# also update the matching section of requirements.txt +# also update the matching section of requirements/requirements.txt # in this directory extras = { "serve": [ @@ -120,7 +120,7 @@ extras["all"] = list(set(chain.from_iterable(extras.values()))) # These are the main dependencies for users of ray. This list # should be carefully curated. If you change it, please reflect -# the change in the matching section of requirements.txt +# the change in the matching section of requirements/requirements.txt install_requires = [ # TODO(alex) Pin the version once this PR is # included in the stable release.