Skip to content

Commit 69d7b22

Browse files
authored
Merge pull request #32 from packethost/fix-ci
Fix Tests and CI
2 parents c15b110 + 197d443 commit 69d7b22

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

.drone.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ pipeline:
1515
- pylama packet test setup.py
1616

1717
test:
18-
image: python:${PYTHON_VERSION}-alpine
18+
image: python:${PYTHON_VERSION}
1919
commands:
20-
- pip install tox
21-
- tox
20+
- apt update -y && apt install -y pandoc
21+
- pip install pypandoc tox
22+
- tox -e py$(echo ${PYTHON_VERSION} | sed 's|\.||')

.travis.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
addons:
2+
apt:
3+
packages:
4+
- pandoc
15
language: python
26
python:
37
- "2.7"
48
- "3.3"
59
- "3.4"
610
- "3.5"
711
- "3.6"
12+
sudo: false
813

9-
install: pip install tox
10-
script: tox
14+
install: pip install pypandoc tox
15+
script: tox -e py$(echo "$TRAVIS_PYTHON_VERSION" | sed 's|\.||')

setup.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#!/usr/bin/env python
22

3+
import os
34
import pypandoc
45

56
try:
@@ -9,14 +10,17 @@
910
use_setuptools()
1011
from setuptools import setup
1112

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

1519
setup(
1620
name='packet-python',
1721
version='1.36.0',
1822
description='Packet API client',
19-
long_description=readme + '\n' + changelog,
23+
long_description=long_description,
2024
url='https://github.com/packethost/packet-python',
2125
author='Packet Developers',
2226
license='LGPL v3',

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ skip_missing_interpreters=True
44

55
[testenv]
66
deps =
7+
pypandoc
78
pytest
89
pytest-cov
910
requests_mock

0 commit comments

Comments
 (0)