Skip to content

Commit 39cd6e2

Browse files
committed
Load package into dist
1 parent df39380 commit 39cd6e2

File tree

6 files changed

+16
-9
lines changed

6 files changed

+16
-9
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ test.py
99
htmlcov
1010
.coverage
1111
_docs
12+
dist
13+
build

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ deploy:
2323
# on:
2424
# tags: true
2525
# python: '3.6.3'
26-
# distributions: sdist bdist_wheel
26+
# distributions: "sdist bdist_wheel"
2727
- provider: pages
2828
local-dir: _docs
2929
github-token: $GITHUB_TOKEN

MANIFEST.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
include README.md LICENSE
1+
include README.md
2+
include LICENSE
3+
include CHANGELOG.md

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,15 @@ docs:
2525
rm -rf _docs
2626
sphinx-build -b html docs _docs
2727

28+
clean:
29+
rm -rf _docs build dist
30+
31+
build:
32+
python setup.py sdist bdist_wheel
33+
2834
watchdocs:
2935
make docs
3036
open _docs/index.html
3137
fswatch -o ${DOC_SOURCES} | xargs -n1 -I{} make docs
3238

33-
.PHONY: test coverage watch run lint docs
39+
.PHONY: test coverage watch run lint docs clean build

setup.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import io
22
import os
33

4-
from setuptools import setup
4+
from setuptools import setup, find_packages
55

66
# Load the version number
77
about = {}
@@ -10,22 +10,20 @@
1010
exec(f.read(), about)
1111

1212
# Import the README and use it as the long-description.
13-
with io.open(os.path.join(here, 'README.md'), encoding='utf-8') as f:
13+
with io.open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
1414
long_description = '\n' + f.read()
1515

1616
setup(
1717
name='amadeus',
1818
version=about['version'],
1919
description='Python module for the Amadeus travel APIs',
2020
long_description=long_description,
21-
long_description_content_type='text/markdown',
2221
author='Amadeus',
2322
author_email='[email protected]',
2423
python_requires='>=2.7.0',
2524
url='https://github.com/amadeus4dev/amadeus-python',
26-
py_modules=['amadeus'],
2725
install_requires=[],
28-
package=['amadeus'],
26+
packages=find_packages(),
2927
include_package_data=True,
3028
license='MIT',
3129
classifiers=[

tox.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ commands =
66
flake8 amadeus specs setup.py
77
mamba
88

9-
109
deps =
1110
mamba==0.9.3
1211
expects==0.8.0

0 commit comments

Comments
 (0)