Skip to content
This repository was archived by the owner on Mar 4, 2026. It is now read-only.

Commit 0acce71

Browse files
committed
setup.py: stop converting md to rst
Closes #34 Closes #35
1 parent b554e05 commit 0acce71

5 files changed

Lines changed: 7 additions & 14 deletions

File tree

.drone.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ pipeline:
1616
test:
1717
image: python:${PYTHON_VERSION}
1818
commands:
19-
- apt update -y && apt install -y pandoc
20-
- pip install pypandoc tox
19+
- pip install tox
2120
- tox -e py$(echo ${PYTHON_VERSION} | sed 's|\.||')

.travis.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
addons:
2-
apt:
3-
packages:
4-
- pandoc
51
language: python
62
python:
73
- "2.7"
@@ -10,5 +6,5 @@ python:
106
- "3.6"
117
sudo: false
128

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

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html
77
## Unreleased
88
### Removed
99
- Support for python3.3
10+
### Changed
11+
- setup.py no longer converts markdown to reST because pypi now supports markdown, woop.
1012

1113
## [1.37.1] - 2018-01-08
1214
### Fixed

setup.py

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

3-
import pypandoc
4-
53
# Notes for the not-an-everyday-python-dev for package distribution on pypi
64
#
75
# Build the package using `setuptools`:
@@ -43,22 +41,21 @@
4341
use_setuptools()
4442
from setuptools import setup
4543

46-
readme = pypandoc.convert_file('README.md', 'rst')
47-
changelog = pypandoc.convert_file('CHANGELOG.md', 'rst')
48-
long_description = readme + '\n' + changelog
44+
with open('README.md') as readme, open('CHANGELOG.md') as changelog:
45+
long_description = readme.read() + '\n' + changelog.read()
4946

5047
setup(
5148
name='packet-python',
5249
version='1.37.1',
5350
description='Packet API client',
5451
long_description=long_description,
52+
long_description_content_type='text/markdown',
5553
url='https://github.com/packethost/packet-python',
5654
author='Packet Developers',
5755
license='LGPL v3',
5856
keywords='packet api client',
5957
packages=['packet'],
6058
install_requires='requests',
61-
setup_requires='pypandoc',
6259
classifiers=[
6360
'Development Status :: 5 - Production/Stable',
6461
'Intended Audience :: Developers',

tox.ini

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

55
[testenv]
66
deps =
7-
pypandoc
87
pytest
98
pytest-cov
109
requests_mock

0 commit comments

Comments
 (0)