From b6517fcf3a4785025e4e93c7188e4ee0727f0271 Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 23 Aug 2012 22:04:25 +0200 Subject: [PATCH 01/14] Commit to trigger Travis-ci. --- .gitignore | 1 + .travis.yml | 9 +++++++++ travis-requirements.txt | 8 ++++++++ 3 files changed, 18 insertions(+) create mode 100644 .travis.yml create mode 100644 travis-requirements.txt diff --git a/.gitignore b/.gitignore index c7bf0a8fe..04dfbede4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ djangorestframework.egg-info/* MANIFEST !.gitignore +!.travis.yml \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..45d5ce132 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +language: python +python: + - "2.5" + - "2.6" + - "2.7" +# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors +install: pip install -r travis-requirements.txt +# command to run tests, e.g. python setup.py test +script: python setup.py test diff --git a/travis-requirements.txt b/travis-requirements.txt new file mode 100644 index 000000000..290d4a1da --- /dev/null +++ b/travis-requirements.txt @@ -0,0 +1,8 @@ +django==1.4.1 +django-staticfiles>=1.1.2 +coverage==3.4 +URLObject>=0.6.0 +unittest-xml-reporting==1.2 +Pyyaml==3.10 +# Optional packages: +markdown From 686211ee307301aca65b77a07a7a649b909a6b8d Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 23 Aug 2012 22:26:51 +0200 Subject: [PATCH 02/14] Tweak travis settings. --- .travis.yml | 10 +++++++++- travis-requirements.txt | 8 -------- 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 travis-requirements.txt diff --git a/.travis.yml b/.travis.yml index 45d5ce132..d7d248c33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,15 @@ python: - "2.5" - "2.6" - "2.7" +env: + - DJANGO=dev + - DJANGO=1.4.1 + - DJANGO=1.3.3 # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors -install: pip install -r travis-requirements.txt +install: + - pip install django==$DJANGO --use-mirrors + - pip install -e . --use-mirrors + - pip install -r requirements.txt + # command to run tests, e.g. python setup.py test script: python setup.py test diff --git a/travis-requirements.txt b/travis-requirements.txt deleted file mode 100644 index 290d4a1da..000000000 --- a/travis-requirements.txt +++ /dev/null @@ -1,8 +0,0 @@ -django==1.4.1 -django-staticfiles>=1.1.2 -coverage==3.4 -URLObject>=0.6.0 -unittest-xml-reporting==1.2 -Pyyaml==3.10 -# Optional packages: -markdown From 0ffa411edfb0ce895e8716262c85c19f2dd9b27c Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 23 Aug 2012 22:55:51 +0200 Subject: [PATCH 03/14] Pull django straight from github. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7d248c33..fdfb7f525 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,12 @@ python: - "2.6" - "2.7" env: - - DJANGO=dev - - DJANGO=1.4.1 - - DJANGO=1.3.3 + - DJANGO=git+https://github.com/django/django.git + - DJANGO=django==1.4.1 --use-mirrors + - DJANGO=django==1.3.3 --use-mirrors # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - - pip install django==$DJANGO --use-mirrors + - pip install $DJANGO - pip install -e . --use-mirrors - pip install -r requirements.txt From 1342b1a69cfed8228dffb1d70142f56e7fa7382e Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 23 Aug 2012 22:58:53 +0200 Subject: [PATCH 04/14] Cloning takes way too long so just download the zip ball. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index fdfb7f525..1096ff519 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ python: - "2.6" - "2.7" env: - - DJANGO=git+https://github.com/django/django.git + - DJANGO=https://github.com/django/django/zipball/master - DJANGO=django==1.4.1 --use-mirrors - DJANGO=django==1.3.3 --use-mirrors # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors From 44a5fa11acd7675823b21a5e73da4fb997f0c1f7 Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 23 Aug 2012 23:14:37 +0200 Subject: [PATCH 05/14] Include examples tests. Drop epio and fox config files. --- .travis.yml | 3 + examples/requirements-epio.txt | 3 - tox.ini | 283 --------------------------------- 3 files changed, 3 insertions(+), 286 deletions(-) delete mode 100644 examples/requirements-epio.txt delete mode 100644 tox.ini diff --git a/.travis.yml b/.travis.yml index 1096ff519..dc798baa6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,14 @@ env: - DJANGO=https://github.com/django/django/zipball/master - DJANGO=django==1.4.1 --use-mirrors - DJANGO=django==1.3.3 --use-mirrors + - TESTS=python setup.py test + - TESTS=python examples/setup.py test # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - pip install $DJANGO - pip install -e . --use-mirrors - pip install -r requirements.txt + - pip install -r examples/requirements.txt # command to run tests, e.g. python setup.py test script: python setup.py test diff --git a/examples/requirements-epio.txt b/examples/requirements-epio.txt deleted file mode 100644 index b49626763..000000000 --- a/examples/requirements-epio.txt +++ /dev/null @@ -1,3 +0,0 @@ -Pygments==1.4 -Markdown==2.0.3 -git+git://github.com/tomchristie/django-rest-framework.git diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 8c3af2567..000000000 --- a/tox.ini +++ /dev/null @@ -1,283 +0,0 @@ -#This file is very NON-DRY because tox currently doesn't support interpolation like configparser does. -#There's a ticket covering this at http://code.google.com/p/pytox/issues/detail?id=17#c0 - -[tox] -envlist= - py25-django12, - py26-django12, - py27-django12, - py25-django13, - py26-django13, - py27-django13, - py25-django14a1, - py26-django14a1, - py27-django14a1, - py25-django12-examples, - py26-django12-examples, - py27-django12-examples, - py25-django13-examples, - py26-django13-examples, - py27-django13-examples, - py25-django14a1-examples, - py26-django14a1-examples, - py27-django14a1-examples - -########################################### CORE TESTS ############################################ - -[testenv] -commands= - python setup.py test - -[testenv:py25-django12] -basepython=python2.5 -deps= - django==1.2.4 - django-staticfiles>=1.1.2 - coverage==3.4 - URLObject>=0.6.0 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - # Optional packages: - markdown - -[testenv:py26-django12] -basepython=python2.6 -deps= - django==1.2.4 - django-staticfiles>=1.1.2 - coverage==3.4 - URLObject>=0.6.0 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - # Optional packages: - markdown - -[testenv:py27-django12] -basepython=python2.7 -deps= - django==1.2.4 - django-staticfiles>=1.1.2 - coverage==3.4 - URLObject>=0.6.0 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - # Optional packages: - markdown - -[testenv:py25-django13] -basepython=python2.5 -deps= - django==1.3 - coverage==3.4 - URLObject>=0.6.0 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - # Optional packages: - markdown - -[testenv:py26-django13] -basepython=python2.6 -deps= - django==1.3 - coverage==3.4 - URLObject>=0.6.0 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - # Optional packages: - markdown - -[testenv:py27-django13] -basepython=python2.7 -deps= - django==1.3 - coverage==3.4 - URLObject>=0.6.0 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - # Optional packages: - markdown - -[testenv:py25-django14a1] -basepython=python2.5 -deps= - http://www.djangoproject.com/download/1.4-alpha-1/tarball/ - coverage==3.4 - URLObject>=0.6.0 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - # Optional packages: - markdown - -[testenv:py26-django14a1] -basepython=python2.6 -deps= - http://www.djangoproject.com/download/1.4-alpha-1/tarball/ - coverage==3.4 - URLObject>=0.6.0 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - # Optional packages: - markdown - -[testenv:py27-django14a1] -basepython=python2.7 -deps= - http://www.djangoproject.com/download/1.4-alpha-1/tarball/ - coverage==3.4 - URLObject>=0.6.0 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - # Optional packages: - markdown - -####################################### EXAMPLES ################################################ - -[testenv:py25-django12-examples] -basepython=python2.5 -commands= - python examples/runtests.py -deps= - django==1.2.4 - django-staticfiles>=1.1.2 - coverage==3.4 - URLObject>=0.6.0 - wsgiref==0.1.2 - Pygments==1.4 - httplib2==0.6.0 - Markdown==2.0.3 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - -[testenv:py26-django12-examples] -basepython=python2.6 -commands= - python examples/runtests.py -deps= - django==1.2.4 - django-staticfiles>=1.1.2 - coverage==3.4 - URLObject>=0.6.0 - wsgiref==0.1.2 - Pygments==1.4 - httplib2==0.6.0 - Markdown==2.0.3 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - -[testenv:py27-django12-examples] -basepython=python2.7 -commands= - python examples/runtests.py -deps= - django==1.2.4 - django-staticfiles>=1.1.2 - coverage==3.4 - URLObject>=0.6.0 - wsgiref==0.1.2 - Pygments==1.4 - httplib2==0.6.0 - Markdown==2.0.3 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - -[testenv:py25-django13-examples] -basepython=python2.5 -commands= - python examples/runtests.py -deps= - django==1.3 - coverage==3.4 - URLObject>=0.6.0 - wsgiref==0.1.2 - Pygments==1.4 - httplib2==0.6.0 - Markdown==2.0.3 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - -[testenv:py26-django13-examples] -basepython=python2.6 -commands= - python examples/runtests.py -deps= - django==1.3 - coverage==3.4 - URLObject>=0.6.0 - wsgiref==0.1.2 - Pygments==1.4 - httplib2==0.6.0 - Markdown==2.0.3 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - -[testenv:py27-django13-examples] -basepython=python2.7 -commands= - python examples/runtests.py -deps= - django==1.3 - coverage==3.4 - URLObject>=0.6.0 - wsgiref==0.1.2 - Pygments==1.4 - httplib2==0.6.0 - Markdown==2.0.3 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - -[testenv:py25-django14a1-examples] -basepython=python2.5 -commands= - python examples/runtests.py -deps= - http://www.djangoproject.com/download/1.4-alpha-1/tarball/ - coverage==3.4 - URLObject>=0.6.0 - wsgiref==0.1.2 - Pygments==1.4 - httplib2==0.6.0 - Markdown==2.0.3 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - -[testenv:py26-django14a1-examples] -basepython=python2.6 -commands= - python examples/runtests.py -deps= - http://www.djangoproject.com/download/1.4-alpha-1/tarball/ - coverage==3.4 - URLObject>=0.6.0 - wsgiref==0.1.2 - Pygments==1.4 - httplib2==0.6.0 - Markdown==2.0.3 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - -[testenv:py27-django14a1-examples] -basepython=python2.7 -commands= - python examples/runtests.py -deps= - http://www.djangoproject.com/download/1.4-alpha-1/tarball/ - coverage==3.4 - URLObject>=0.6.0 - wsgiref==0.1.2 - Pygments==1.4 - httplib2==0.6.0 - Markdown==2.0.3 - unittest-xml-reporting==1.2 - Pyyaml==3.10 - -##########################################DOCS################################################# - -[testenv:docs] -basepython=python -changedir=docs -deps= - sphinx - pytest - django==1.3 -commands= - py.test --tb=line -v --junitxml=junit-{envname}.xml check_sphinx.py From af7214f86a6ba63dbdaee4427c1ed947a8565217 Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 23 Aug 2012 23:16:51 +0200 Subject: [PATCH 06/14] whoops. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc798baa6..14273c8a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: - DJANGO=django==1.4.1 --use-mirrors - DJANGO=django==1.3.3 --use-mirrors - TESTS=python setup.py test - - TESTS=python examples/setup.py test + - TESTS=python examples/runtests.py # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - pip install $DJANGO @@ -17,4 +17,4 @@ install: - pip install -r examples/requirements.txt # command to run tests, e.g. python setup.py test -script: python setup.py test +script: $TESTS From 7a90704f9fbf56b7c18ec49964f3ab589d1adb28 Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 23 Aug 2012 23:23:35 +0200 Subject: [PATCH 07/14] Should be at test coverage where we left off with tox. --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14273c8a5..d46e8b7e1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,11 +4,12 @@ python: - "2.6" - "2.7" env: - - DJANGO=https://github.com/django/django/zipball/master - - DJANGO=django==1.4.1 --use-mirrors - - DJANGO=django==1.3.3 --use-mirrors - - TESTS=python setup.py test - - TESTS=python examples/runtests.py + - DJANGO=https://github.com/django/django/zipball/master TESTS=python setup.py test + - DJANGO=https://github.com/django/django/zipball/master TESTS=python examples/runtests.py + - DJANGO=django==1.4.1 --use-mirrors TESTS=python setup.py test + - DJANGO=django==1.4.1 --use-mirrors TESTS=python setup.py test examples/runtests.py + - DJANGO=django==1.3.3 --use-mirrors TESTS=python setup.py test + - DJANGO=django==1.3.3 --use-mirrors TESTS=python setup.py test examples/runtests.py # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - pip install $DJANGO From 58741bb6698138f7b3fd46e7c10d2e7928b2657a Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 23 Aug 2012 23:27:53 +0200 Subject: [PATCH 08/14] Trigger build. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d46e8b7e1..038905bd5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,4 +18,5 @@ install: - pip install -r examples/requirements.txt # command to run tests, e.g. python setup.py test -script: $TESTS +script: + - $TESTS From 128231ddfe6d0f417e1e4c948becb96545e87d25 Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Thu, 23 Aug 2012 23:40:54 +0200 Subject: [PATCH 09/14] Use quotes around envvar that will be used for script running. --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 038905bd5..32b4fa29b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,12 @@ python: - "2.6" - "2.7" env: - - DJANGO=https://github.com/django/django/zipball/master TESTS=python setup.py test - - DJANGO=https://github.com/django/django/zipball/master TESTS=python examples/runtests.py - - DJANGO=django==1.4.1 --use-mirrors TESTS=python setup.py test - - DJANGO=django==1.4.1 --use-mirrors TESTS=python setup.py test examples/runtests.py - - DJANGO=django==1.3.3 --use-mirrors TESTS=python setup.py test - - DJANGO=django==1.3.3 --use-mirrors TESTS=python setup.py test examples/runtests.py + - DJANGO=https://github.com/django/django/zipball/master TESTS='python setup.py test' + - DJANGO=https://github.com/django/django/zipball/master TESTS='python examples/runtests.py' + - DJANGO=django==1.4.1 --use-mirrors TESTS='python setup.py test' + - DJANGO=django==1.4.1 --use-mirrors TESTS='python setup.py test examples/runtests.py. + - DJANGO=django==1.3.3 --use-mirrors TESTS='python setup.py test' + - DJANGO=django==1.3.3 --use-mirrors TESTS='python setup.py test examples/runtests.py' # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - pip install $DJANGO From 38c2f6c5bed1cc42e1eafd34b9e87b63734fcc85 Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Fri, 24 Aug 2012 00:23:13 +0200 Subject: [PATCH 10/14] Show live build status in read me file. --- README.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index d5fc0ce89..5d3f8ba40 100644 --- a/README.rst +++ b/README.rst @@ -21,7 +21,14 @@ Full documentation for the project is available at http://django-rest-framework. Issue tracking is on `GitHub `_. General questions should be taken to the `discussion group `_. -We also have a `Jenkins service `_ which runs our test suite. +Project +======= + +:build status: |build-image| + +.. |build-image| image:: https://secure.travis-ci.org/markotibold/django-rest-framework.png?branch=master + :target: https://secure.travis-ci.org/markotibold/django-rest-framework + Requirements: From 77862832dfb54baf189fc763e181d6dcfff6805c Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Fri, 24 Aug 2012 00:26:29 +0200 Subject: [PATCH 11/14] Update conf. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 32b4fa29b..12bed5d76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,9 @@ env: - DJANGO=https://github.com/django/django/zipball/master TESTS='python setup.py test' - DJANGO=https://github.com/django/django/zipball/master TESTS='python examples/runtests.py' - DJANGO=django==1.4.1 --use-mirrors TESTS='python setup.py test' - - DJANGO=django==1.4.1 --use-mirrors TESTS='python setup.py test examples/runtests.py. + - DJANGO=django==1.4.1 --use-mirrors TESTS='python examples/runtests.py. - DJANGO=django==1.3.3 --use-mirrors TESTS='python setup.py test' - - DJANGO=django==1.3.3 --use-mirrors TESTS='python setup.py test examples/runtests.py' + - DJANGO=django==1.3.3 --use-mirrors TESTS='python examples/runtests.py' # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors install: - pip install $DJANGO From 31affbf4ed6a209409849318fdeeaf6899c73396 Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Fri, 24 Aug 2012 09:28:50 +0200 Subject: [PATCH 12/14] Trigger ci. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 12bed5d76..c4e6d2585 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: python + python: - "2.5" - "2.6" From ce1a82ee287615b71827e4e4d55a2f9d46015f59 Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Fri, 24 Aug 2012 09:50:40 +0200 Subject: [PATCH 13/14] Fix typo. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c4e6d2585..7cc2a31ff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ env: - DJANGO=https://github.com/django/django/zipball/master TESTS='python setup.py test' - DJANGO=https://github.com/django/django/zipball/master TESTS='python examples/runtests.py' - DJANGO=django==1.4.1 --use-mirrors TESTS='python setup.py test' - - DJANGO=django==1.4.1 --use-mirrors TESTS='python examples/runtests.py. + - DJANGO=django==1.4.1 --use-mirrors TESTS='python examples/runtests.py' - DJANGO=django==1.3.3 --use-mirrors TESTS='python setup.py test' - DJANGO=django==1.3.3 --use-mirrors TESTS='python examples/runtests.py' # command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors From 58c15068c4b18c14aa13436513dc3ff62817675b Mon Sep 17 00:00:00 2001 From: Marko Tibold Date: Sat, 25 Aug 2012 01:04:40 +0200 Subject: [PATCH 14/14] Trigger ci --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 7cc2a31ff..99a9b59ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,3 +21,4 @@ install: # command to run tests, e.g. python setup.py test script: - $TESTS +