SRCDIR = $(CURDIR)/src
TESTDIR = $(CURDIR)/test
-TESTLIB = $(TESTDIR)/lib
-BUILDDIR = $(CURDIR)/build
+TESTLIB = $(TESTDIR)/lib
+BUILDDIR = $(CURDIR)/build/lib
DISTDIR = $(CURDIR)/dist
-SUBBUILDDIR = $(shell python -c 'import distutils.util, sys; \
- print "lib.%s-%s" % (distutils.util.get_platform(), \
- sys.version[0:3])')
-PYTHON25 := $(shell python -c 'import sys; v = sys.version_info; \
- print (1 if v[0] <= 2 and v[1] <= 5 else 0)')
-
-ifeq ($(PYTHON25),0)
-BUILDDIR := $(BUILDDIR)/$(SUBBUILDDIR)
-else
-BUILDDIR := $(BUILDDIR)/lib
-endif
-
PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
coverage)
PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
done; exit $$retval
+ifeq ($(file),)
+test-one:
+ echo Run $(make) $@ file=test/some/path
+else
test-one: all
echo $(file) $(case)
PYTHONPATH="$(PYPATH)" $(file) $(case)
+endif
+
+test-app:
+ $(MAKE) test-one file=test/resources/linux/application.py case=$(case)
+test-node:
+ $(MAKE) test-one file=test/resources/linux/node.py case=$(case)
coverage: all
rm -f .coverage
rm -f .coverage
clean:
- rm -f `find -name \*.pyc` .coverage *.pcap
+ rm -f $$(find . -name '*.pyc') .coverage *.pcap
rm -rf "$(BUILDDIR)"
distclean: clean
# this assumes you have an entry 'pypi' in your .pypirc
# see pypi documentation on how to create .pypirc
PYPI_TARGET=pypi
-PYPI_TARBALL_HOST=root@build.onelab.eu
+PYPI_TARBALL_HOST=mario@build.onelab.eu
PYPI_TARBALL_TOPDIR=/build/nepi
VERSION=$(shell cat VERSION)
VERSIONTAG=nepi-$(VERSION)-pypi
+VERSIONTAR=nepi-$(VERSION).tar.gz
ALREADY_SET=$(shell git tag | grep '^$(VERSIONTAG)$$')
# run this only once the sources are in on the right tag
@if [ -n "$(ALREADY_SET)" ] ; then echo "tag $(VERSIONTAG) already set"; false; fi
@echo "You are about to release $(VERSION) - OK (Ctrl-c if not) ? " ; read _
git tag $(VERSIONTAG)
- setup.py sdist upload -r pypi
- @if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/nepi-$(VERSION).tar.gz ] ;\
- then echo "nepi-$(VERSION).tar.gz already present on $(PYPI_TARBALL_HOST) - ignored" ;\
- else rsync -av dist/nepi-$(VERSION).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\
+ #./setup.py sdist upload -r pypi
+ ./setup.py sdist
+ twine upload dist/* -r pypi
+ @if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAR) ] ;\
+ then echo "$(VERSIONTAR) already present on $(PYPI_TARBALL_HOST) - ignored" ;\
+ else rsync -av dist/$(VERSIONTAR) $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\
fi
# in this case we do not want to upload anything on the build box though
testpypi:
- setup.py sdist upload -r testpypi
+ #./setup.py sdist upload -r testpypi
+ ./setup.py sdist
+ twine upload dist/* -r testpypi