Skip to content

Commit

Permalink
Remove requirements.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
adborden committed Jul 12, 2019
1 parent 23db972 commit 5c5008f
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 76 deletions.
34 changes: 21 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,32 @@ jobs:
test:
machine: true
parallelism: 5
environment:
PIPENV_VENV_IN_PROJECT: 1
steps:
- checkout
# TODO once kitchen is removed, we can use a python docker instance
# without having to manually install python.
- run:
name: install python
command: |
cd /opt/circleci/.pyenv/plugins/python-build/../.. && git pull && cd -
pyenv install
- run:
name: install pipenv
command: pip install -U pipenv
# Restore cache and install python dependencies
- restore_cache:
keys:
- v1-pip-{{ checksum "requirements.txt" }}
- v1-pip-
- run: |
virtualenv venv
. venv/bin/activate
pip install -r requirements.txt
- v1-pipenv-{{ checksum "Pipfile.lock" }}
- v1-pipenv-
- run:
name: install python dependencies
command: pipenv install --dev
- save_cache:
key: v1-pip-{{ checksum "requirements.txt" }}
key: v1-pipenv-{{ checksum "Pipfile.lock" }}
paths:
- venv
- .venv
# Restore cache and install ruby dependencies
- restore_cache:
keys:
Expand All @@ -44,15 +55,12 @@ jobs:
- vendor/bundle
- run:
name: Setup ansible-galaxy
command: |
. venv/bin/activate
make update-vendor-force
command: pipenv run make update-vendor-force
- run:
name: Run tests
command: |
. venv/bin/activate
TEST_TARGETS=$(make circleci-glob | circleci tests split)
make ${TEST_TARGETS}
pipenv run make ${TEST_TARGETS}
workflows:
Expand Down
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.6.8
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ update-vendor-force-verbose:
ansible-galaxy install -p ansible/roles/vendor -r ansible/roles/vendor/requirements.yml --force -vvv

setup:
pip install -r requirements.txt
pipenv install --dev
bundle install

lint:
Expand Down
2 changes: 1 addition & 1 deletion docs/principles.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Ruby
Node
* package.json
Python
* requirements.txt
* Pipfile
Makefile
Maven

Expand Down
61 changes: 0 additions & 61 deletions requirements.txt

This file was deleted.

0 comments on commit 5c5008f

Please sign in to comment.