Use py.test
This commit is contained in:
Bastian Kleineidam
parent
21ae776aca
commit
d8407a73ce
36
Makefile
36
Makefile
|
|
@ -9,40 +9,33 @@ ARCHIVE_WIN32:=$(APPNAME)-$(VERSION).exe
|
|||
PY_FILES_DIRS := patool setup.py patoolib tests
|
||||
PY2APPOPTS ?=
|
||||
ifeq ($(shell uname),Darwin)
|
||||
NOSETESTS:=/usr/local/share/python/nosetests
|
||||
NUMPROCESSORS:=$(shell sysctl -a | grep machdep.cpu.core_count | cut -d " " -f 2)
|
||||
CHMODMINUSMINUS:=
|
||||
else
|
||||
NOSETESTS:=$(shell which nosetests)
|
||||
NUMPROCESSORS:=$(shell grep -c processor /proc/cpuinfo)
|
||||
CHMODMINUSMINUS:=--
|
||||
endif
|
||||
+NOSETESTS:=$(shell which nosetests)
|
||||
# Nose options:
|
||||
# - do not show output of successful tests
|
||||
# Pytest options:
|
||||
# - use multiple processors
|
||||
# - be verbose
|
||||
# - only run test_* methods
|
||||
NOSEOPTS:=--logging-clear-handlers --processes=$(NUMPROCESSORS) -v -m '^test_.*'
|
||||
# - write test results in file
|
||||
# - run all tests found in the "tests" subdirectory
|
||||
PYTESTOPTS:=-n $(NUMPROCESSORS) --resultlog=testresults.txt
|
||||
# which test modules to run
|
||||
TESTS ?= tests/
|
||||
# set test options, eg. to "--nologcapture"
|
||||
# set test options
|
||||
TESTOPTS=
|
||||
|
||||
all:
|
||||
|
||||
|
||||
.PHONY: chmod
|
||||
chmod:
|
||||
-chmod -R a+rX,u+w,go-w $(CHMODMINUSMINUS) *
|
||||
find . -type d -exec chmod 755 {} \;
|
||||
|
||||
.PHONY: dist
|
||||
dist:
|
||||
git archive --format=tar --prefix=$(APPNAME)-$(VERSION)/ HEAD | gzip -9 > ../$(ARCHIVE)
|
||||
# cd .. && zip -r - patool-git -x "**/.git/**" > $(HOME)/temp/share/patool-devel.zip
|
||||
|
||||
.PHONY: sign
|
||||
sign:
|
||||
[ -f ../$(ARCHIVE).sha1 ] || sha1sum ../$(ARCHIVE) > ../$(ARCHIVE).sha1
|
||||
[ -f ../$(ARCHIVE).asc ] || gpg --detach-sign --armor ../$(ARCHIVE)
|
||||
|
|
@ -51,7 +44,6 @@ sign:
|
|||
[ -f dist/$(ARCHIVE_RPM).sha1 ] || sha1sum dist/$(ARCHIVE_RPM) > dist/$(ARCHIVE_RPM).sha1
|
||||
[ -f dist/$(ARCHIVE_RPM).asc ] || gpg --detach-sign --armor dist/$(ARCHIVE_RPM)
|
||||
|
||||
.PHONY: upload
|
||||
upload: doc/README.md sign
|
||||
rsync -avP -e ssh doc/README.md ../$(ARCHIVE)* ../$(ARCHIVE_WIN32)* dist/$(ARCHIVE_RPM)* calvin,patool@frs.sourceforge.net:/home/frs/project/p/pa/patool/$(VERSION)/
|
||||
|
||||
|
|
@ -62,7 +54,6 @@ doc/README.md: doc/README-Download.md.tmpl doc/changelog.txt
|
|||
awk '/released/ {c++}; c==2 {exit}; {print " " $$0}' doc/changelog.txt >> $@
|
||||
|
||||
|
||||
.PHONY: release
|
||||
release: clean releasecheck dist upload
|
||||
git tag upstream/$(VERSION)
|
||||
@echo "Register at Python Package Index..."
|
||||
|
|
@ -70,7 +61,6 @@ release: clean releasecheck dist upload
|
|||
freecode-submit < patool.freecode
|
||||
|
||||
|
||||
.PHONY: releasecheck
|
||||
releasecheck: check test
|
||||
@if egrep -i "xx\.|xxxx|\.xx" doc/changelog.txt > /dev/null; then \
|
||||
echo "Could not release: edit doc/changelog.txt release date"; false; \
|
||||
|
|
@ -84,17 +74,14 @@ releasecheck: check test
|
|||
fi
|
||||
|
||||
# Build OSX installer
|
||||
.PHONY: app
|
||||
app: clean chmod
|
||||
$(PYTHON) setup.py py2app $(PY2APPOPTS)
|
||||
|
||||
.PHONY: rpm
|
||||
rpm:
|
||||
$(PYTHON) setup.py bdist_rpm
|
||||
|
||||
# The check programs used here are mostly local scripts on my private system.
|
||||
# So for other developers there is no need to execute this target.
|
||||
.PHONY: check
|
||||
check:
|
||||
[ ! -d .svn ] || check-nosvneolstyle -v
|
||||
check-copyright
|
||||
|
|
@ -102,34 +89,31 @@ check:
|
|||
py-tabdaddy
|
||||
py-unittest2-compat tests/
|
||||
|
||||
.PHONY: pyflakes
|
||||
pyflakes:
|
||||
pyflakes $(PY_FILES_DIRS)
|
||||
|
||||
.PHONY: count
|
||||
count:
|
||||
@sloccount patool patoolib | grep "Total Physical Source Lines of Code"
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
find . -name \*.pyc -delete
|
||||
find . -name \*.pyo -delete
|
||||
rm -rf build dist
|
||||
|
||||
.PHONY: test
|
||||
test:
|
||||
$(PYTHON) $(NOSETESTS) $(NOSEOPTS) $(TESTOPTS) $(TESTS)
|
||||
$(PYTHON) -m pytest $(PYTESTOPTS) $(TESTOPTS) $(TESTS)
|
||||
|
||||
doc/patool.txt: doc/patool.1
|
||||
cols=`stty size | cut -d" " -f2`; stty cols 72; man -l doc/patool.1 | perl -pe 's/.\cH//g' > doc/patool.txt; stty cols $$cols
|
||||
|
||||
.PHONY: deb
|
||||
deb:
|
||||
git-buildpackage --git-export-dir=../build-area/ --git-upstream-branch=master --git-debian-branch=debian --git-ignore-new
|
||||
git-buildpackage --git-export-dir=../debian/build-area/ --git-upstream-branch=master --git-debian-branch=debian --git-ignore-new
|
||||
|
||||
update-copyright:
|
||||
update-copyright --holder="Bastian Kleineidam"
|
||||
|
||||
.PHONY: changelog
|
||||
changelog:
|
||||
sftrack_changelog patool calvin@users.sourceforge.net doc/changelog.txt $(DRYRUN)
|
||||
|
||||
.PHONY: changelog update-copyright deb test clean count pyflakes check rpm app
|
||||
.PHONY: releasecheck release upload sign dist chmod all
|
||||
|
|
|
|||
Loading…
Reference in New Issue