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.

Sign up for GitHub

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

Jump to bottom

chore(api): Update pipenv and use pipenv sync #2501

Merged
merged 1 commit into from
Oct 17, 2018
Merged

chore(api): Update pipenv and use pipenv sync #2501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ install: install-py install-js

.PHONY: install-py
install-py:
$(OT_PYTHON) -m pip install pipenv==11.6.8
$(OT_PYTHON) -m pip install pipenv==2018.10.9
$(MAKE) -C $(API_DIR) install
$(MAKE) -C $(UPDATE_SERVER_DIR) install

Expand Down
4 changes: 2 additions & 2 deletions api/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ python := pipenv run python
pip := pipenv run pip
pytest := pipenv run py.test
pipenv_opts := --dev
pipenv_opts += $(and $(CI),--ignore-pipfile)
pipenv_opts += $(and $(CI),--keep-outdated)

tests ?= tests
test_opts ?=

.PHONY: install
install:
pipenv install $(pipenv_opts)
pipenv sync $(pipenv_opts)

.PHONY: all
all: lint test
Expand Down
4 changes: 2 additions & 2 deletions update-server/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ PATH := $(shell cd .. && yarn bin):$(PATH)

python := pipenv run python
pipenv_opts := --dev
pipenv_opts += $(and $(CI),--ignore-pipfile)
pipenv_opts += $(and $(CI),--keep-outdated)
port ?= 34000

# make bootstrap wheel file (= rather than := to expand at every use)
wheel = $(wildcard dist/*.whl)

.PHONY: install
install:
pipenv install $(pipenv_opts)
pipenv sync $(pipenv_opts)

.PHONY: dev
dev: export ENABLE_VIRTUAL_SMOOTHIE := true
Expand Down