Skip to content

Commit

Permalink
Merge branch 'release/1.4.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
crucialfelix committed Nov 7, 2015
2 parents cfbc6db + 36f2804 commit ae1c519
Show file tree
Hide file tree
Showing 70 changed files with 3,927 additions and 1,124 deletions.
12 changes: 10 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
*.pyc
*.pyc
*.egg-info/
example/AJAXSELECTS/*
example/AJAXSELECTS/*
.tox
htmlcov
.coverage
docs/_build
example/ajax_select
example/ajax_selects_example
dist
MANIFEST
21 changes: 21 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
language: python
sudo: false
env:
- TOX_ENV=py27-flake8
- TOX_ENV=py34-flake8
- TOX_ENV=py27-dj15
- TOX_ENV=py27-dj16
- TOX_ENV=py32-dj15
- TOX_ENV=py32-dj16
- TOX_ENV=py33-dj15
- TOX_ENV=py33-dj16
- TOX_ENV=py27-dj17
- TOX_ENV=py27-dj18
- TOX_ENV=py27-dj19
- TOX_ENV=py34-dj17
- TOX_ENV=py34-dj18
- TOX_ENV=py34-dj19
install:
- pip install -r requirements-test.txt
script:
- tox -e $TOX_ENV
705 changes: 705 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
recursive-include example *.py *.sh *.txt
prune example/AJAXSELECTS
prune example/ajax_select
recursive-include tests *.py
include README.md
43 changes: 43 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
.PHONY: clean-pyc clean-build

help:
@echo "test - run tests quickly with the currently installed Django"
@echo "clean - remove build artifacts"
@echo "lint - check style with flake8"
@echo "release - package and upload a release"
@echo "sdist - package"
# @echo "docs - generate Sphinx HTML documentation, including API docs"

clean: clean-build clean-pyc

clean-build:
rm -fr build/
rm -fr dist/
rm -fr *.egg-info

clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
find . -name '*.pyo' -exec rm -f {} +
find . -name '*~' -exec rm -f {} +

lint:
flake8 .

test:
tox

# docs:
# rm -f docs/django-ajax-selects.rst
# rm -f docs/modules.rst
# sphinx-apidoc -o docs/ django-ajax-selects
# $(MAKE) -C docs clean
# $(MAKE) -C docs html
# open docs/_build/html/index.html

release: clean
python setup.py sdist upload
python setup.py bdist_wheel upload

sdist: clean
python setup.py sdist
ls -l dist
69 changes: 0 additions & 69 deletions OrderedManyToMany.md

This file was deleted.

Loading

0 comments on commit ae1c519

Please sign in to comment.