makefile work

Arrowbox · Feb 4, 2017 · 92396a0 · 92396a0
1 parent 50d3f66
commit 92396a0
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -1,10 +1,16 @@
+PYTHON ?= $(shell which python)
+BIN := $(shell dirname $(PYTHON))
+TEST_PLATFORM := $(shell python -c "import sys; print('win' if 'win' in sys.platform else 'unix')")
+PYTHON_MAJOR_VERSION := $(shell $(PYTHON) -c "import sys; print(sys.version_info[0])")
+PYTEST := PYTHON_MAJOR_VERSION=$(PYTHON_MAJOR_VERSION) TEST_PLATFORM=$(TEST_PLATFORM) $(BIN)/py.test
+
 clean:
 	find . -name \*.py[cod] -delete
 	find . -name __pycache__ -delete
 	rm -rf *.egg-info* .cache build
 	rm -f .coverage .coverage.* junit.xml tmpfile.rc conda/.version tempfile.rc coverage.xml
 	rm -rf auxlib bin conda/progressbar
-	rm -rf conda-forge\:\: file\: https\: local\:\: r\:\:
+	rm -rf conda-forge\:\: file\: https\: local\:\: r\:\: aprefix
 
 
 clean-all: clean
@@ -44,4 +50,10 @@ toolz:
 	rm -rf conda/_vendor/toolz/curried conda/_vendor/toolz/sandbox conda/_vendor/toolz/tests
 
 
-.PHONY : clean clean-all anaconda-submit anaconda-submit-upload auxlib boltons toolz
+smoketest:
+	py.test tests/test_create.py::test_create_install_update_remove
+
+unit:
+	time $(PYTEST) -m "not integration"
+
+.PHONY : clean clean-all anaconda-submit anaconda-submit-upload auxlib boltons toolz smoketest
diff --git a/conda/common/signals.py b/conda/common/signals.py
@@ -7,6 +7,12 @@
 
 
 def get_signal_name(signum):
+    """
+    Examples:
+        >>> get_signal_name(9)
+        'SIGKILL'
+
+    """
     return next((k for k, v in iteritems(signal.__dict__)
                  if v == signum and k.startswith('SIG') and not k.startswith('SIG_')),
                 None)
diff --git a/setup.cfg b/setup.cfg
@@ -1,4 +1,6 @@
 [tool:pytest]
+minversion = 3.0
+testpaths = tests conda
 norecursedirs = .* *.egg* build dist conda/_vendor/* conda_env/*
 addopts =
     --ignore setup.py
@@ -7,6 +9,7 @@ addopts =
     --tb native
     --strict
     --durations 8
+    --doctest-modules
 doctest_optionflags =
     NORMALIZE_WHITESPACE
     IGNORE_EXCEPTION_DETAIL
@@ -30,6 +33,9 @@ exclude = build/*,.tox/*,tests/*,ve/*,*/_vendor/*,conda/compat.py,conda/common/c
 
 
 [coverage:report]
+show_missing = True
+sort = Miss
+skip_covered = True
 omit =
     */site-packages/*
     *\site-packages\*
@@ -42,6 +48,8 @@ omit =
     tests/*
 exclude_lines =
     pragma: no cover
+    pragma: py$PYTHON_MAJOR_VERSION no cover
+    pragma: py$PYTHON_MAJOR_VERSION no cover
     raise AssertionError
     raise NotImplementedError
     if __name__ == .__main__.: