Merge pull request #109 from markmcclain/cleanup

remove old Makefile and correct setup.py license
This commit is contained in:
Ryan Petrello 2015-03-23 13:39:54 -04:00
commit e81a08fb89
2 changed files with 1 additions and 137 deletions

View File

@ -1,136 +0,0 @@
LIB = akanda
UNAME := $(shell uname)
DEV_DIR = ~/lab/DreamHost/dhc
PYPF_DIR = $(DEV_DIR)/pypf
TXROUTES_DIR = $(DEV_DIR)/txroutes
AKANDA_DIR = $(DEV_DIR)/akanda
PYPF_INSTALL = /usr/local/lib/python2.7/site-packages/pypf
PYPF_URL = git@github.com:dreamhost/pypf.git
TXROUTES_URL = git@github.com:dreamhost/txroutes.git
AKANDA_URL = git@github.com:dreamhost/akanda.git
USER ?= oubiwann
REQUIREMENTS = requirements.txt
PYTHON = python2.7
EASYINSTALL = easy_install-2.7
WHICH_PIP = $(shell which pip)
PIP = pip-2.7
GIT = git
#PF_HOST ?= 10.0.4.186
PF_HOST_UNAME ?= OpenBSD
# XXX To work around a bug in nosetests -- which DOESN't point to python2.7,
# only to /usr/bin/python -- we need to use a full path here and call Python
# explicitly.
NOSE = $(PYTHON) $(shell which nosetests-2.7)
VENV = .venv
clean:
rm -rfv dist/ build/ MANIFEST *.egg-info $(REQUIREMENTS)
rm -rfv _trial_temp/ CHECK_THIS_BEFORE_UPLOAD.txt twistd.log
find ./ -name "*~" -exec rm -v {} \;
find ./ -name "*.py[co]" -exec rm -v {} \;
find . -name "*.sw[op]" -exec rm -v {} \;
system-setup:
pw user mod $(USER) -G wheel
install-ports:
portsnap fetch
portsnap extract
update-ports:
portsnap fetch
portsnap update
$(PYTHON):
ifeq ($(UNAME), FreeBSD)
cd /usr/ports/lang/python && make install clean
endif
ifeq ($(UNAME), OpenBSD)
pkg_add -i python
endif
$(GIT):
ifeq ($(UNAME), FreeBSD)
cd /usr/ports/devel/git && make install clean
endif
ifeq ($(UNAME), OpenBSD)
pkg_add -i git
endif
$(DEV_DIR):
mkdir -p $(DEV_DIR)
$(REQUIREMENTS):
$(PYTHON) -c "from akanda import meta;meta.generate_requirements('$(REQUIREMENTS)');"
$(WHICH_PIP):
$(EASYINSTALL) pip
python-deps: $(REQUIREMENTS) $(WHICH_PIP)
$(PIP) install -r $(REQUIREMENTS)
install-dev: $(PYTHON) $(GIT) python-deps
ifeq ($(UNAME), FreeBSD)
@echo "Be sure you have pf enabled on your system:"
@echo " * edit your /etc/rc.conf"
@echo " * add rules to /etc/pf.conf"
@echo " * start pf: sudo /etc/rc.d/pf start"
@echo
@echo "To use the dev targets, you will need to edit your"
@echo "/etc/ssh/sshd_config to allow remote login for root"
@echo "and then you'll need to restart ssh:"
@echo " /etc/rc.d/sshd restart"
@echo
endif
local-dev-deps:
ifeq ($(PF_HOST_UNAME), FreeBSD)
ssh root@$(PF_HOST) "cd /usr/ports/net/rsync && make install clean"
endif
ifeq ($(PF_HOST_UNAME), OpenBSD)
ssh root@$(PF_HOST) "pkg_add -i rsync"
endif
clone-dev:
git push
-ssh root@$(PF_HOST) \
"git clone $(AKANDA_URL) $(AKANDA_DIR)"
push-dev: clone-dev
git push
ssh root@$(PF_HOST) \
"cd $(AKANDA_DIR) && git pull && python setup.py install"
rsync-push-dev: local-dev-deps
rsync -az -e "ssh . root@$(PF_HOST):$(AKANDA_DIR)/"
scp-push-dev:
scp -r . root@$(PF_HOST):$(AKANDA_DIR)/
ssh root@$(PF_HOST) \
"cd $(AKANDA_DIR) && python setup.py install"
check: python-deps
$(PYTHON) $(LIB)/testing/runner.py
check-cover: python-deps
$(NOSE) -v --with-coverage --cover-package=$(LIB) --cover-branches
check-dev:
-make check-cover
-pep8 $(LIB)
-pyflakes $(LIB)
venv: easy_install
virtualenv -p $(shell which $(PYTHON)) $(VENV)
check-venv: setup-venv
. $(VENV)/bin/activate && make check-dev
iso:
"./scripts/create-akanda-livecd.sh"
run-dev:
$(PYTHON) akanda/routerapi/devserver.py
install: python-deps
$(PIP) install .

View File

@ -25,7 +25,7 @@ setup(
author='DreamHost',
author_email='dev-community@dreamhost.com',
url='http://github.com/dreamhost/akanda',
license='BSD',
license='Apache2',
install_requires=[
'flask>=0.9',
'dogpile.cache>=0.5.4',