Skip to content

Commit

Permalink
Merge pull request #58 from amirziai/update-travis
Browse files Browse the repository at this point in the history
Update travis
  • Loading branch information
amirziai authored Oct 8, 2019
2 parents 0af7045 + b2415e9 commit 710113c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 17 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@
.pydevproject

.idea

build/
dist/
12 changes: 2 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
language: python
python:
- "2.7"
- "3.3"
- "3.4"
- "3.6"
# PyPy versions
- "pypy" # PyPy2 2.5.0
- "pypy3" # Pypy3 2.4.0
- "pypy-5.3.1"
# command to install dependencies
- "3.7"
- "pypy3"
install:
- pip install -r requirements.txt
# command to run tests
script: pytest
8 changes: 1 addition & 7 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
from setuptools import setup


def readme():
with open('README.md') as f:
return f.read()


setup(
name='flatten_json',
py_modules=['flatten_json', 'util'],
version='0.1.7',
version='0.1.8',
description='Flatten JSON objects',
long_description=readme(),
license='MIT',
author='Amir Ziai',
author_email='arziai@gmail.com',
Expand Down

0 comments on commit 710113c

Please sign in to comment.