Skip to content

Commit

Permalink
Merge pull request #24 from txels/carles/license
Browse files Browse the repository at this point in the history
Carles/license
  • Loading branch information
txels committed Jan 26, 2015
2 parents 08aacf0 + 849142a commit a96252f
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ python:
#- 3.2
- 3.3
- 3.4
install: pip install -r test-requirements.txt
install: pip install -r requirements/test.txt
script:
- nosetests --with-cov --cover-package=ddt
- flake8 ddt.py test
35 changes: 35 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Contributing to DDT

We'll be happy if you want to contribute to the improvement of `ddt`.

Code contributions will take the form of pull requests to
[the github repo](https://github.com/txels/ddt).

Your PRs are more likely to be merged quickly if:

- They adhere to coding conventions in the repo (PEP8)
- They include tests

## Building


The simplest way to build `ddt` is using `tox`:

```
pip install tox
tox
```

This will run tests on various releases of python (2 and 3, as long as they
are installed in your computer), run `flake8` and build the Sphinx
documentation.

PRs to `ddt` are always built by travis-ci using tox.

Alternatively, if you ony want to run tests on your active version of python,
I recommend you make yourself a virtual environment and:

```
pip install -r requirements/build.txt
./build.sh
```
21 changes: 21 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Copyright © 2015 Carles Barrobés and additional contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the “Software”), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

[MIT License](http://mit-license.org/)
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[![Build Status](https://travis-ci.org/txels/ddt.png)](https://travis-ci.org/bulkan/ddt)
[![Code Health](https://landscape.io/github/txels/ddt/master/landscape.svg)](https://landscape.io/github/txels/ddt/master)
[![Can I Use Python 3?](https://caniusepython3.com/project/ddt.svg)](https://caniusepython3.com/project/ddt)

DDT (Data-Driven Tests) allows you to multiply one test case
Expand All @@ -11,3 +12,6 @@ Installation
```pip install ddt```

More info at http://ddt.readthedocs.org/

See [Contributing](CONTRIBUTING.md) if you plan to contribute to `ddt`,
and [License](LICENSE.md) if you plan to use it.
2 changes: 2 additions & 0 deletions doc-requirements.txt → requirements/build.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
-r test.txt

Sphinx
sphinxcontrib-programoutput
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
classifiers=[
'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
'License :: OSI Approved :: MIT License',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
Expand Down

0 comments on commit a96252f

Please sign in to comment.