Skip to content

Commit 4a70a08

Browse files
pietrodnpeterbarker
authored andcommitted
setup.py, requirements.txt, README.md improvements
- future is not a direct dependency of dronekit: remove it - README.md: Python 3-compatible "Hello World" - PyPI badge: link to the package page on PyPI - setup.py: add classifier for Python 3 - setup.py: install monotonic only for Python<3.3 - setup.py: automatically discover packages with setuptools
1 parent 4ea3b9f commit 4a70a08

File tree

3 files changed

+30
-33
lines changed

3 files changed

+30
-33
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
![dronekit_python_logo](https://cloud.githubusercontent.com/assets/5368500/10805537/90dd4b14-7e22-11e5-9592-5925348a7df9.png)
44

5-
![PyPi published version](https://img.shields.io/pypi/v/dronekit.svg)
5+
[![PyPi published version](https://img.shields.io/pypi/v/dronekit.svg)](https://pypi.org/project/dronekit/)
66
[![Windows Build status](https://img.shields.io/appveyor/ci/3drobotics/dronekit-python/master.svg?label=windows)](https://ci.appveyor.com/project/3drobotics/dronekit-python/branch/master)
77
[![OS X Build Status](https://img.shields.io/travis/dronekit/dronekit-python/master.svg?label=os%20x)](https://travis-ci.org/dronekit/dronekit-python)
88
[![Linux Build Status](https://img.shields.io/circleci/project/dronekit/dronekit-python/master.svg?label=linux)](https://circleci.com/gh/dronekit/dronekit-python) <a href="https://gitter.im/dronekit/dronekit-python?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"><img align="right" src="https://badges.gitter.im/Join%20Chat.svg"></img></a>
@@ -25,12 +25,12 @@ The [Quick Start](http://python.dronekit.io/guide/quick_start.html) guide explai
2525
A basic script looks like this:
2626

2727
```python
28-
from dronekit import connect, VehicleMode
28+
from dronekit import connect
2929

3030
# Connect to UDP endpoint.
3131
vehicle = connect('127.0.0.1:14550', wait_ready=True)
3232
# Use returned Vehicle object to query device state - e.g. to get the mode:
33-
print " Mode: %s" % vehicle.mode.name
33+
print("Mode: %s" % vehicle.mode.name)
3434
```
3535

3636
Once you've got DroneKit set up, the [guide](http://python.dronekit.io/guide/index.html) explains how to perform operations like taking off and flying the vehicle. You can also try out most of the tasks by running the [examples](http://python.dronekit.io/examples/index.html).

requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
pymavlink>=2.2.20
22
monotonic>=1.3
3-
future>=0.15.2
43
nose>=1.3.7
54
mock>=2.0.0
65
dronekit-sitl==3.2.0

setup.py

+27-29
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
1-
from setuptools import setup, Extension
2-
import platform
1+
import setuptools
32

43
version = '2.9.1'
54

6-
setup(name='dronekit',
7-
zip_safe=True,
8-
version=version,
9-
description='Developer Tools for Drones.',
10-
long_description='Python API for communication and control of drones over MAVLink.',
11-
url='https://github.com/dronekit/dronekit-python',
12-
author='3D Robotics',
13-
install_requires=[
14-
'pymavlink>=2.2.20',
15-
'monotonic>=1.2',
16-
'future>=0.15.2'
17-
],
18-
19-
classifiers=[
20-
'Development Status :: 5 - Production/Stable',
21-
'Environment :: Console',
22-
'Intended Audience :: Science/Research',
23-
'License :: OSI Approved :: Apache Software License',
24-
'Operating System :: OS Independent',
25-
'Programming Language :: Python :: 2.7',
26-
'Topic :: Scientific/Engineering',
27-
],
28-
license='apache',
29-
packages=[
30-
'dronekit', 'dronekit.test'
31-
],
32-
ext_modules=[])
5+
setuptools.setup(
6+
name='dronekit',
7+
zip_safe=True,
8+
version=version,
9+
description='Developer Tools for Drones.',
10+
long_description='Python API for communication and control of drones over MAVLink.',
11+
url='https://github.com/dronekit/dronekit-python',
12+
author='3D Robotics',
13+
install_requires=[
14+
'pymavlink>=2.2.20',
15+
'monotonic>=1.3 ; python_version<"3.3"',
16+
],
17+
18+
classifiers=[
19+
'Development Status :: 5 - Production/Stable',
20+
'Environment :: Console',
21+
'Intended Audience :: Science/Research',
22+
'License :: OSI Approved :: Apache Software License',
23+
'Operating System :: OS Independent',
24+
'Programming Language :: Python :: 2.7',
25+
'Programming Language :: Python :: 3',
26+
'Topic :: Scientific/Engineering',
27+
],
28+
license='apache',
29+
packages=setuptools.find_packages()
30+
)

0 commit comments

Comments
 (0)