From 31b786be1639caea5f0a7d57e0f698d61d60b8b9 Mon Sep 17 00:00:00 2001 From: Heidi Tong Date: Tue, 25 Aug 2020 13:10:23 -0700 Subject: [PATCH] Added requirements file in root directory --- .circleci/config.yml | 10 +++++----- appveyor.yml | 2 +- requirements.txt | 7 +++++++ tests/requirements.txt | 9 +-------- 4 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 requirements.txt diff --git a/.circleci/config.yml b/.circleci/config.yml index 8bad495f..770329da 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -110,7 +110,7 @@ jobs: - restore_cache: &restore-cache-template keys: - - v1-dependencies-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }} + - v1-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }} - run: name: create virtualenv @@ -122,12 +122,12 @@ jobs: command: | . env/bin/activate python --version - pip install -r tests/requirements.txt + pip install -r requirements.txt -r tests/requirements.txt - save_cache: &save-cache-template paths: - ./env - key: v1-dependencies-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }} + key: v1-dependencies-{{ checksum "requirements.txt" }}-{{ checksum "tests/requirements.txt" }}-{{ .Environment.CIRCLE_JOB }} - run: &build-ext-template name: install package @@ -229,7 +229,7 @@ jobs: command: | eval "$(pyenv init -)" python --version - pip install -r tests/requirements.txt + pip install -r requirements.txt -r tests/requirements.txt - save_cache: *save-cache-template @@ -301,7 +301,7 @@ jobs: command: | for PYBIN in /opt/python/*/bin; do if "${PYBIN}/python" -c "import sys; sys.exit(sys.version_info>=(3, 5) and sys.version_info<(3, 9))"; then continue; fi; - "${PYBIN}/pip" install -r tests/requirements.txt + "${PYBIN}/pip" install -r requirements.txt -r tests/requirements.txt "${PYBIN}/pip" wheel . -w ./wheelhouse "${PYBIN}/python" setup.py sdist -d ./dist done diff --git a/appveyor.yml b/appveyor.yml index ca828ee1..65aa4b17 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -110,7 +110,7 @@ build_script: test_script: # Run the project tests - - pip install -r tests\requirements.txt + - pip install -r requirements.txt -r tests\requirements.txt - python -m nose . --exe after_test: diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 00000000..c1f34b50 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +scipy==1.4.1 +networkx==2.4 +dwave-networkx==0.8.6 +numpy==1.18.5 +fasteners==0.15 +homebase==1.0.1 +Cython==0.29.21 \ No newline at end of file diff --git a/tests/requirements.txt b/tests/requirements.txt index 6ba0ccf3..a6c00fed 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,9 +1,2 @@ -Cython==0.29.21 -dwave-networkx==0.8.6 -fasteners==0.15 -homebase==1.0.1 -networkx==2.4 -numpy==1.18.5 -scipy==1.4.1 -dwave-system nose>=1.3 +dwave-system \ No newline at end of file