Skip to content

Commit 94c64ff

Browse files
committed
Fix testing config using tox.
1 parent b61d8bd commit 94c64ff

File tree

6 files changed

+22
-7
lines changed

6 files changed

+22
-7
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
.DS_Store
66
.python-version
77
*.egg-info/
8+
.tox/*

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ matrix:
1010
install:
1111
- pip install tox
1212
script:
13-
- tox -e $TOXENV
13+
- tox -e $TOXENV test

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<p align="center"><a href="https://travis-ci.org/elastic/site-search-python"><img src="https://travis-ci.org/elastic/site-search-python.png?branch=master" alt="Travis build"></a>
44
<a href="https://github.com/elastic/site-search-python/releases"><img src="https://img.shields.io/github/release/elastic/site-search-python/all.svg?style=flat-square" alt="GitHub release" /></a></p>
55

6-
> A first-party Python client for the [Elastic Site Search API](https://swiftype.com/documentation/site-search/overview).
6+
> A first-party Python client for the [Elastic Site Search API](https://elastic.co/products/site-search).
77
88
## Contents
99

@@ -30,11 +30,11 @@ To install locally, clone this repository, `cd` into the directory and run:
3030
python setup.py install
3131
```
3232

33-
> **Note:** This client has been developed for the [Elastic Site Search](https://www.swiftype.com/site-search) API endpoints only. You may refer to the [Elastic Site Search API Documentation](https://swiftype.com/documentation/site-search/overview) for additional context.
33+
> **Note:** This client has been developed for the [Elastic Site Search](https://elastic.co/products/site-search) API endpoints only. You may refer to the [Elastic Site Search API Documentation](https://swiftype.com/documentation/site-search/overview) for additional context.
3434
3535
## Usage
3636

37-
1. Create [Elastic Site Search account](https://swiftype.com/) and get your API key from your [Account Settings](https://app.swiftype.com/settings/account).
37+
1. Create [Elastic Site Search account](https://app.swiftype.com/signup) and get your API key from your [Account Settings](https://app.swiftype.com/settings/account).
3838

3939
2. Configure your client:
4040

requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
anyjson==0.3.3
2+
six==1.12.0

setup.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
11
#!/usr/bin/env python
22

33
from setuptools import setup, find_packages
4+
from codecs import open
5+
from os import path
6+
from unittest import TestLoader
47

58
from elastic_site_search.version import VERSION
69

10+
here = path.abspath(path.dirname(__file__))
11+
12+
with open(path.join(here, 'README.md'), encoding='utf-8') as f:
13+
long_description = f.read()
14+
715
setup(
816
name = 'elastic-site-search',
917
version = VERSION,
1018
description = 'Elastic Site Search API Client for Python',
19+
long_description=long_description,
20+
long_description_content_type='text/markdown',
1121
author = 'Elastic',
1222
author_email = 'support@elastic.co',
1323
url = 'https://github.com/elastic/site-search-python',
14-
packages = find_packages(),
24+
packages = find_packages(exclude=['tests', 'fixtures']),
1525
install_requires = ["anyjson", "six"],
26+
tests_require=['nose', 'vcrpy', 'mock', 'unittest2'],
1627
test_suite='nose.collector',
1728
classifiers = [
1829
'Intended Audience :: Developers',

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ envlist = py27,py36,pypy
33
skip_missing_interpreters = true
44

55
[testenv]
6-
deps = -rtest_requirements.txt
7-
6+
deps =
7+
-rrequirements.txt
8+
-rtest_requirements.txt
89
commands = python setup.py test

0 commit comments

Comments
 (0)