Skip to content

Commit

Permalink
Merge pull request #32 from packethost/fix-ci
Browse files Browse the repository at this point in the history
Fix Tests and CI
  • Loading branch information
mmlb authored Oct 16, 2017
2 parents c15b110 + 197d443 commit 69d7b22
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 8 deletions.
7 changes: 4 additions & 3 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ pipeline:
- pylama packet test setup.py

test:
image: python:${PYTHON_VERSION}-alpine
image: python:${PYTHON_VERSION}
commands:
- pip install tox
- tox
- apt update -y && apt install -y pandoc
- pip install pypandoc tox
- tox -e py$(echo ${PYTHON_VERSION} | sed 's|\.||')
9 changes: 7 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
addons:
apt:
packages:
- pandoc
language: python
python:
- "2.7"
- "3.3"
- "3.4"
- "3.5"
- "3.6"
sudo: false

install: pip install tox
script: tox
install: pip install pypandoc tox
script: tox -e py$(echo "$TRAVIS_PYTHON_VERSION" | sed 's|\.||')
10 changes: 7 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python

import os
import pypandoc

try:
Expand All @@ -9,14 +10,17 @@
use_setuptools()
from setuptools import setup

readme = pypandoc.convert_file('README.md', 'rst')
changelog = pypandoc.convert_file('CHANGELOG.md', 'rst')
long_description = 'This library provides the python client for the Packet API.'
if os.path.isfile('README.md') and os.path.isfile('CHANGELOG.md'):
readme = pypandoc.convert_file('README.md', 'rst')
changelog = pypandoc.convert_file('CHANGELOG.md', 'rst')
long_description = readme + '\n' + changelog

setup(
name='packet-python',
version='1.36.0',
description='Packet API client',
long_description=readme + '\n' + changelog,
long_description=long_description,
url='https://github.com/packethost/packet-python',
author='Packet Developers',
license='LGPL v3',
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ skip_missing_interpreters=True

[testenv]
deps =
pypandoc
pytest
pytest-cov
requests_mock
Expand Down

0 comments on commit 69d7b22

Please sign in to comment.