Skip to content

Commit

Permalink
Merge pull request #675 from screamerbg/development
Browse files Browse the repository at this point in the history
Bump to version 1.7.0 and add Python 3 compatiblity notes
  • Loading branch information
theotherjimmy authored May 25, 2018
2 parents 892f907 + 160259c commit a182064
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ Windows, Linux and Mac OS X support Mbed CLI. We're keen to learn about your exp

### Requirements

* **Python** - Mbed CLI is a Python script, so you'll need Python to use it. We test Mbed CLI with [version 2.7.11 of Python](https://www.python.org/downloads/release/python-2711/). It is not compatible with Python 3.
* **Python** - Mbed CLI is a Python script, so you'll need Python to use it. We test Mbed CLI with [version 2.7.11 of Python](https://www.python.org/downloads/release/python-2711/) and [version 3.6.0 of Python](https://www.python.org/downloads/release/python-360/)

#### Mbed CLI and pip compatibility

<span class="notes">**Note:** Mbed CLI toolchain versions older than 1.5.1 are **not compatible** with `pip` version 10.0 (or newer). Please use latest Mbed CLI with newer version of `pip`. More details in Mbed CLI issue [#657](https://github.com/ARMmbed/mbed-cli/issues/657).</span>
<span class="notes">**Note:** Mbed CLI versions older than 1.5.1 are **not compatible** with `pip` version 10.0 (or newer). Also Mbed CLI versions older than 1.7.0 support only Python 2. Please use latest Mbed CLI.</span>


* **Git and Mercurial** - Mbed CLI supports both Git and Mercurial repositories, so you need to install both:
Expand Down
2 changes: 1 addition & 1 deletion mbed/mbed.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@


# Application version
ver = '1.6.0'
ver = '1.7.0'

# Default paths to Mercurial and Git
hg_cmd = 'hg'
Expand Down
8 changes: 4 additions & 4 deletions pypi_readme.rst
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
.. image:: https://circleci.com/gh/ARMmbed/mbed-cli.svg?style=svg

mbed CLI is the name of the `ARM-mbed <https://mbed.org>`_ command line tool, packaged as mbed-cli, which enables the full mbed workflow: repositories version control, maintaining dependencies, publishing code, updating from remotely hosted repositories (GitHub, GitLab and mbed.org), and invoking ARM mbed's own build system and export functions, among other operations.
Mbed CLI is the name of the `Arm Mbed <https://mbed.com>`_ command line tool, packaged as mbed-cli, which enables the full mbed workflow: repositories version control, maintaining dependencies, publishing code, updating from remotely hosted repositories (GitHub, GitLab and mbed.com), and invoking Arm Mbed's own build system and export functions, among other operations.


Installation
============
mbed CLI is a Python script, so you'll need Python installed in order to use it. mbed CLI was tested with Python 2.7.
Mbed CLI is a Python script, so you'll need Python installed in order to use it. mbed CLI was tested with Python 2.7 and Python 3.6.

mbed CLI supports both Git and Mercurial repositories, so you'll also need to install Mercurial and Git.
Mbed CLI supports both Git and Mercurial repositories, so you'll also need to install Mercurial and Git.

Get Started
===========
The best way to get started is to `read the documentation on GitHub <https://github.com/ARMmbed/mbed-cli/blob/master/README.md>`_.

License
=======
mbed CLI is licensed under Apache-2.0
Mbed CLI is licensed under Apache-2.0
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

setup(
name="mbed-cli",
version="1.6.0",
description="ARM mbed command line tool for repositories version control, publishing and updating code from remotely hosted repositories (GitHub, GitLab and mbed.org), and invoking mbed OS own build system and export functions, among other operations",
version="1.7.0",
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",
long_description=LONG_DESC,
url='http://github.com/ARMmbed/mbed-cli',
author='ARM mbed',
Expand All @@ -32,5 +32,5 @@
'mbed-cli=mbed.mbed:main',
]
},
python_requires='>=2.7.10, <3',
python_requires='>=2.7.10,!=3.0.*,!=3.1.*,<4',
)

0 comments on commit a182064

Please sign in to comment.