Skip to content
This repository has been archived by the owner on Jul 17, 2018. It is now read-only.

Commit

Permalink
moved repo to accent and circleci
Browse files Browse the repository at this point in the history
  • Loading branch information
bigmassa committed Jun 23, 2016
1 parent a5a26dc commit 1666de6
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 33 deletions.
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

24 changes: 24 additions & 0 deletions circle.yml
@@ -0,0 +1,24 @@
machine:
python:
version: '2.7.9'
environment:
TOX_PYPY: 'pypy-2.5.0'
TOX_PY: '2.7.9'
TOX_PY27: '2.7.10'
TOX_PY33: '3.3.3'
TOX_PY34: '3.4.3'

dependencies:
pre:
- sudo apt-get install python-dev
override:
- pip -V
- pip install -U tox coveralls
- pyenv local $TOX_PY34 $TOX_PY33 $TOX_PY27 $TOX_PYPY

test:
override:
- tox -v --recreate
post:
- cp -r htmlcov $CIRCLE_ARTIFACTS
- coveralls
6 changes: 3 additions & 3 deletions setup.py
Expand Up @@ -6,14 +6,14 @@
description='Django model based search for Django CMS',
long_description=open('README.rst').read(),
author='Stuart George',
author_email='stuart.bigmassa@gmail.com',
url='https://github.com/bigmassa/djangocms-site-search',
author_email='stuart@accentdesign.com',
url='https://github.com/AccentDesign/djangocms-site-search',
download_url='https://pypi.python.org/pypi/djangocms-site-search',
license='MIT',
packages=find_packages(exclude=('example',)),
install_requires=[
'Django>=1.8,<1.10',
'django-cms>=3.1,<3.3',
'django-cms>=3.1,<3.4',
],
include_package_data=True,
keywords = ['djangocms', 'django', 'cms', 'search', 'site'],
Expand Down
7 changes: 5 additions & 2 deletions test_requirements/base.txt
@@ -1,4 +1,7 @@
mock
coverage
tox
tox-pyenv
djangocms-admin-style
django-appconf
django-appconf
mock
nose
13 changes: 11 additions & 2 deletions tox.ini
Expand Up @@ -7,18 +7,27 @@ skip_missing_interpreters=True

[testenv]
commands =
{envpython} --version
python -V
env
coverage erase
coverage run test_settings.py
coverage report
coverage combine
coverage html
coverage report

deps =
cms31: django-cms>=3.1,<3.2
cms32: django-cms>=3.2,<3.3
dj18: -rtest_requirements/django_1.8.txt
dj19: -rtest_requirements/django_1.9.txt

setenv =
TOX_ENV_NAME={envname}
PYTHONPATH={toxinidir}
passenv = TOX_*

whitelist_externals = env

[testenv:flake8]
deps = flake8
commands = flake8
Expand Down

0 comments on commit 1666de6

Please sign in to comment.