Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Standardizing package requirements files #151

Merged
merged 1 commit into from
Aug 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -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
9 changes: 1 addition & 8 deletions tests/requirements.txt
Original file line number Diff line number Diff line change
@@ -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