ynerant
/
django-cas-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into federate

This commit is contained in:
Valentin Samir 2016-06-19 13:22:32 +02:00
parent e8a587f48a 155a919287
commit 8ab7352f4b
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -1,4 +1,4 @@
.PHONY: clean build install dist test_venv .PHONY: clean build install dist test_venv test_project
VERSION=`python setup.py -V` VERSION=`python setup.py -V`
build: build:
@ -22,14 +22,15 @@ clean_all: clean_pyc clean_build clean_tox clean_test_venv
dist: dist:
python setup.py sdist python setup.py sdist
test_venv: dist test_venv:
mkdir -p test_venv mkdir -p test_venv
virtualenv test_venv virtualenv test_venv
test_venv/bin/pip install -U django-cas-server -f ./dist/django-cas-server-${VERSION}.tar.gz test_venv/bin/pip install -U --requirement requirements.txt
test_venv/cas: test_venv/cas/manage.py:
mkdir -p test_venv/cas mkdir -p test_venv/cas
test_venv/bin/django-admin startproject cas test_venv/cas test_venv/bin/django-admin startproject cas test_venv/cas
ln -s ../../cas_server test_venv/cas/cas_server
sed -i "s/'django.contrib.staticfiles',/'django.contrib.staticfiles',\n 'bootstrap3',\n 'cas_server',/" test_venv/cas/cas/settings.py sed -i "s/'django.contrib.staticfiles',/'django.contrib.staticfiles',\n 'bootstrap3',\n 'cas_server',/" test_venv/cas/cas/settings.py
sed -i "s/'django.middleware.clickjacking.XFrameOptionsMiddleware',/'django.middleware.clickjacking.XFrameOptionsMiddleware',\n 'django.middleware.locale.LocaleMiddleware',/" test_venv/cas/cas/settings.py sed -i "s/'django.middleware.clickjacking.XFrameOptionsMiddleware',/'django.middleware.clickjacking.XFrameOptionsMiddleware',\n 'django.middleware.locale.LocaleMiddleware',/" test_venv/cas/cas/settings.py
sed -i 's/from django.conf.urls import url/from django.conf.urls import url, include/' test_venv/cas/cas/urls.py sed -i 's/from django.conf.urls import url/from django.conf.urls import url, include/' test_venv/cas/cas/urls.py
@ -37,5 +38,9 @@ test_venv/cas:
test_venv/bin/python test_venv/cas/manage.py migrate test_venv/bin/python test_venv/cas/manage.py migrate
test_venv/bin/python test_venv/cas/manage.py createsuperuser test_venv/bin/python test_venv/cas/manage.py createsuperuser
run_test_server: test_venv test_venv/cas test_project: test_venv test_venv/cas/manage.py
@echo "##############################################################"
@echo "A test django project was created in $(realpath test_venv/cas)"
run_test_server: test_project
test_venv/bin/python test_venv/cas/manage.py runserver test_venv/bin/python test_venv/cas/manage.py runserver

1
requirements-dev.txt
View File

@ -1,3 +1,4 @@
Django >= 1.8,<1.10
tox==1.8.1 tox==1.8.1
pytest==2.6.4 pytest==2.6.4
pytest-django==2.7.0 pytest-django==2.7.0

1
requirements.txt
View File

@ -1,3 +1,4 @@
Django >= 1.8,<1.10
setuptools>=5.5 setuptools>=5.5
requests>=2.4 requests>=2.4
requests_futures>=0.9.5 requests_futures>=0.9.5