Skip to content

Commit 3ffdd43

Browse files
authored
Merge pull request #719 from screamerbg/f/pypi-markdown
Bump version to 1.7.5 and add pypi.org markdown support
2 parents a92d7da + 7953239 commit 3ffdd43

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

mbed/mbed.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949

5050
# Application version
51-
ver = '1.7.4'
51+
ver = '1.7.5'
5252

5353
# Default paths to Mercurial and Git
5454
hg_cmd = 'hg'

setup.py

+11-5
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
import os
1414
from setuptools import setup
1515

16-
LONG_DESC = open('pypi_readme.rst').read()
17-
LICENSE = open('LICENSE').read()
16+
with open("README.md", "r") as fh:
17+
long_description = fh.read()
1818

1919
setup(
2020
name="mbed-cli",
21-
version="1.7.4",
21+
version="1.7.5",
2222
description="Arm Mbed command line tool for repositories version control, publishing and updating code from remotely hosted repositories (GitHub, GitLab and mbed.com), and invoking Mbed OS own build system and export functions, among other operations",
23-
long_description=LONG_DESC,
23+
long_description=long_description,
24+
long_description_content_type="text/markdown",
2425
url='http://github.com/ARMmbed/mbed-cli',
2526
author='ARM mbed',
2627
author_email='[email protected]',
27-
license=LICENSE,
2828
packages=["mbed"],
2929
entry_points={
3030
'console_scripts': [
@@ -33,4 +33,10 @@
3333
]
3434
},
3535
python_requires='>=2.7.10,!=3.0.*,!=3.1.*,<4',
36+
classifiers=(
37+
"Programming Language :: Python :: 2",
38+
"Programming Language :: Python :: 3",
39+
"License :: OSI Approved :: Apache Software License",
40+
"Operating System :: OS Independent",
41+
),
3642
)

0 commit comments

Comments
 (0)