Skip to content

Commit

Permalink
Merge pull request #161 from influxdata/jdstrand/makefile-no-dash-e
Browse files Browse the repository at this point in the history
chore: don't use -e with pip install
  • Loading branch information
jdstrand authored Sep 25, 2024
2 parents 7da44f9 + 2439662 commit 3973db3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ Within sedg, this file was initially created with:
$ . ./.venv/bin/activate # enter '.venv'
# create prod requirements.txt by installing prod deps into '.venv' based
# on setup.cfg [options] then creating the requirements.txt lock file
$ pip install -e .
$ pip install -e .[cache]
$ pip install -e .[dso]
$ pip install .
$ pip install .[cache]
$ pip install .[dso]
$ pip freeze | grep -Ev '^(-e|sedg==)' > ./requirements.txt
# create dev requirements_dev.txt by installing dev deps on top of prod
# deps based on setup.cfg [options.extras_require], then diff the output
# with requirements.txt to create the requirements_dev.txt lock file
$ pip install -e .[dev]
$ pip install .[dev]
$ pip freeze | grep -v '^-e' > ./requirements_dev.tmp
$ echo "-r requirements.txt" > ./requirements_dev.txt
$ diff -Nau ./requirements.txt ./requirements_dev.tmp | \
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ install-venv:
@if test -z "$(VIRTUAL_ENV)" ; then \
echo "Installing to '$(VENV)'" ; \
. ./$(VENV)/bin/activate ; \
pip install -r ./requirements.txt -e . ; \
pip install -r ./requirements.txt . ; \
echo "\nInstalled sedg to ./$(VENV). To use, run '. ./$(VENV)/bin/activate'" ; \
else \
echo "Updating '$(VENV)'" ; \
pip install -r ./requirements.txt -e . ; \
pip install -r ./requirements.txt . ; \
echo "\nUpdated sedg in ./$(VENV)." ; \
fi

Expand All @@ -29,11 +29,11 @@ install-venv-dev:
@if test -z "$(VIRTUAL_ENV)" ; then \
echo "Installing to '$(VENV)'" ; \
. ./$(VENV)/bin/activate ; \
pip install -r ./requirements_dev.txt -e . ; \
pip install -r ./requirements_dev.txt . ; \
echo "\nInstalled sedg development to ./$(VENV). To use, run '. ./$(VENV)/bin/activate'" ; \
else \
echo "Updating '$(VENV)'" ; \
pip install -r ./requirements_dev.txt -e . ; \
pip install -r ./requirements_dev.txt . ; \
echo "\nUpdated sedg development in ./$(VENV)." ; \
fi

Expand Down

0 comments on commit 3973db3

Please sign in to comment.