33#
44
55# PY[3] is the target Python interpreter. It must have pytest installed.
6+ SHELL = /bin/bash
67
78PY ?= python
89PY2 ?= python2
@@ -74,7 +75,7 @@ PY_TEST=TZ=$(TZ) $(PY) -m pytest $(PYTESTOPTS)
7475PY2TEST=TZ =$(TZ ) $(PY2 ) -m pytest $(PYTESTOPTS )
7576PY3TEST=TZ =$(TZ ) $(PY3 ) -m pytest $(PYTESTOPTS )
7677
77- .PHONY : all test clean upload FORCE
78+ .PHONY : all test clean FORCE
7879all : help
7980
8081help :
8384 @echo " test Run unit tests under Python2/3 (no serial_test w/o 'make SERIAL_TEST=1 test')"
8485 @echo " install Install in /usr/local for Python2/3"
8586 @echo " clean Remove build artifacts"
86- @echo " upload Upload new version to pypi (package maintainer only)"
8787 @echo
8888 @echo " virtualbox-* Manage VirtualBox virtual machine"
8989 @echo " vmware-* Manage VMWare Fusion virtual machine (recommended; requires license)"
@@ -115,7 +115,7 @@ pylint:
115115# nix-venv-activate
116116#
117117# The default is the Python 3 crypto_licensing target in default.nix; choose
118- # TARGET=cpppo_py2 to test under Python 2 (more difficult as time goes on). See default.nix for
118+ # TARGET=py27 to test under Python 2 (more difficult as time goes on). See default.nix for
119119# other Python version targets.
120120#
121121nix-% :
@@ -169,12 +169,6 @@ install: $(WHEEL) FORCE
169169install-% : # ...-dev, -tests
170170 $(PY3 ) -m pip install --upgrade -r requirements-$* .txt
171171
172- # Support uploading a new version of cpppo to pypi. Must:
173- # o advance __version__ number in cpppo/version.py
174- # o log in to your pypi account (ie. for package maintainer only)
175-
176- upload : clean
177- $(PY3 ) setup.py sdist upload
178172
179173clean :
180174 @rm -rf MANIFEST * .png build dist auto * .egg-info $(shell find . -name '* .pyc' -o -name '__pycache__' )
@@ -190,7 +184,7 @@ unit-%:
190184#
191185# venv: Create a Virtual Env containing the installed repo
192186#
193- .PHONY : venv venv-activate.sh venv-activate
187+ .PHONY : venv
194188venv : $(VENV )
195189 @echo; echo " *** Activating $< VirtualEnv for Interactive $( SHELL) "
196190 @bash --init-file $< /bin/activate -i
0 commit comments