Skip to content

Commit

Permalink
Merge pull request #5 from joncotton/tests
Browse files Browse the repository at this point in the history
tests - replace Lettuce and add Tox, TravisCI and Coveralls
  • Loading branch information
joncotton committed Jun 24, 2014
2 parents f64a2f0 + e58b63e commit 98605f2
Show file tree
Hide file tree
Showing 15 changed files with 244 additions and 438 deletions.
6 changes: 6 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[run]
source = armstrong.utils.backends
branch = True

[html]
directory = coverage
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
*.pyc
*~
*.swp
coverage/*
build/*
*.egg-info
.tox/
.coverage
coverage*/
build/
mydatabase
MANIFEST
dist/
22 changes: 22 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
language: python
python:
- 2.6
- 2.7
install:
- pip install -r requirements/dev.txt
- pip install .
- pip install coverage coveralls Django==$DJANGO_VERSION
env:
- DJANGO_VERSION=1.6.5
- DJANGO_VERSION=1.5.8
- DJANGO_VERSION=1.4.13
- DJANGO_VERSION=1.3.7
script: coverage run -m armstrong.dev.dev_django test
after_success: coveralls
notifications:
email: false
irc:
on_success: change
on_failure: always
channels:
- "irc.freenode.org#armstrongcms"
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ include README.rst
include CHANGES.rst
include package.json
prune build/*
prune tests
20 changes: 19 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
armstrong.utils.backends
========================

.. image:: https://travis-ci.org/armstrong/armstrong.utils.backends.svg?branch=master
:target: https://travis-ci.org/armstrong/armstrong.utils.backends
:alt: TravisCI status
.. image:: https://coveralls.io/repos/armstrong/armstrong.utils.backends/badge.png
:target: https://coveralls.io/r/armstrong/armstrong.utils.backends
:alt: Coverage status
.. image:: https://pypip.in/version/armstrong.utils.backends/badge.png
:target: https://pypi.python.org/pypi/armstrong.utils.backends/
:alt: PyPI Version
.. image:: https://pypip.in/license/armstrong.utils.backends/badge.png
:target: https://pypi.python.org/pypi/armstrong.utils.backends/
:alt: License

Generic backend system to use throughout Armstrong


Expand Down Expand Up @@ -107,12 +121,16 @@ Development occurs on Github. Participation is welcome!
* Found a bug? File it on `Github Issues`_. Include as much detail as you
can and make sure to list the specific component since we use a centralized,
project-wide issue tracker.
* Testing? ``pip install tox`` and run ``tox``
* Have code to submit? Fork the repo, consolidate your changes on a topic
branch and create a `pull request`_.
branch and create a `pull request`_. The `armstrong.dev`_ package provides
tools for testing, coverage and South migration as well as making it very
easy to run a full Django environment with this component's settings.
* Questions, need help, discussion? Use our `Google Group`_ mailing list.

.. _Github Issues: https://github.com/armstrong/armstrong/issues
.. _pull request: http://help.github.com/pull-requests/
.. _armstrong.dev: https://github.com/armstrong/armstrong.dev
.. _Google Group: http://groups.google.com/group/armstrongcms


Expand Down
65 changes: 0 additions & 65 deletions armstrong/utils/backends/features/backend-object.feature

This file was deleted.

16 changes: 0 additions & 16 deletions armstrong/utils/backends/features/backends.feature

This file was deleted.

30 changes: 0 additions & 30 deletions armstrong/utils/backends/features/multi-backend.feature

This file was deleted.

0 comments on commit 98605f2

Please sign in to comment.