Skip to content

Commit

Permalink
Merge pull request #46 from davips/davipsbranch
Browse files Browse the repository at this point in the history
Better Makefile to avoid problems with venv inside project folder.
  • Loading branch information
ealcobaca committed Nov 30, 2019
2 parents d84547c + 2266378 commit 27f6e41
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
11 changes: 8 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ following rules before submitting a pull request:
[coding-guidelines](http://scikit-learn.org/dev/developers/contributing.html#coding-guidelines)
as for scikit-learn.

- When applicable, use the validation tools and other code in the
`pymfe._internal` submodule.
- When applicable, use the validation tools cited below (pytest, pylint and mypy).

- Avoid reinventing the wheel, reuse the functions from the `pymfe._internal` submodule.

- If your pull request addresses an issue, please use the title to describe
the issue and mention the issue number in the pull request description to
the issue and mention the issue number (using #) in the pull request description to
ensure a link is created to the original issue.

- All public methods should have informative docstrings with sample
Expand All @@ -65,6 +66,10 @@ following rules before submitting a pull request:
to indicate you are working on something to avoid duplicated work,
request a broad review of functionality or API, or seek collaborators.

- Don't forget to activate your virtual environment, if any:

$ source venv/bin/activate

- All other tests pass when everything is rebuilt from scratch. On
Unix-like systems, check with (from the top-level source folder):

Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
all: clean code-check test-cov
all: install-dev code-check test-cov

clean:
find . -name "*.so" -o -name "*.pyc" -o -name "*.md5" -o -name "*.pyd" -o -name "*~" | xargs rm -f
Expand All @@ -25,8 +25,11 @@ pypi: clean
python3 setup.py sdist bdist_wheel
twine upload dist/*

install-dev: install
install-dev: install-dev-pymfe
pip install -U -r requirements-dev.txt

install:
pip install -U -r requirements.txt

install-dev-pymfe: install
pip install -e .

0 comments on commit 27f6e41

Please sign in to comment.