Skip to content

Commit dad59df

Browse files
committed
Update from most recent cookiecutter
1 parent 67fef34 commit dad59df

File tree

3 files changed

+80
-77
lines changed

3 files changed

+80
-77
lines changed

.travis.yml

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,32 @@
66
dist: xenial
77
language: python
88
python:
9-
- "3.6"
9+
- "3.6"
1010

1111
cache:
12-
pip: true
12+
pip: true
13+
14+
env:
15+
- DEPLOY_PYPI="true"
1316

1417
deploy:
15-
provider: releases
16-
api_key: $GITHUB_TOKEN
17-
file_glob: true
18-
file: $TRAVIS_BUILD_DIR/bundles/*
19-
skip_cleanup: true
20-
overwrite: true
21-
on:
22-
tags: true
18+
- provider: releases
19+
api_key: "$GITHUB_TOKEN"
20+
file_glob: true
21+
file: "$TRAVIS_BUILD_DIR/bundles/*"
22+
skip_cleanup: true
23+
overwrite: true
24+
on:
25+
tags: true
26+
# TODO: Use 'travis encrypt --com -r adafruit/<repo slug>' to generate
27+
# the encrypted password for adafruit-travis. Paste result below.
28+
- provider: pypi
29+
user: adafruit-travis
30+
password:
31+
secure: #-- PASTE ENCRYPTED PASSWORD HERE --#
32+
on:
33+
tags: true
34+
condition: $DEPLOY_PYPI = "true"
2335

2436
install:
2537
- pip install -r requirements.txt
@@ -29,5 +41,5 @@ install:
2941
script:
3042
- pylint adafruit_rplidar.py
3143
- ([[ ! -d "examples" ]] || pylint --disable=missing-docstring,invalid-name,bad-whitespace examples/*.py)
32-
- circuitpython-build-bundles --filename_prefix adafruit_circuitpython-circuitpython-rplidar --library_location .
44+
- circuitpython-build-bundles --filename_prefix adafruit-circuitpython-rplidar --library_location .
3345
- cd docs && sphinx-build -E -W -b html . _build/html && cd ..

README.md

Lines changed: 0 additions & 51 deletions
This file was deleted.

setup.py

Lines changed: 57 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,63 @@
1-
import setuptools
1+
"""A setuptools based setup module.
22
3-
with open("README.md", "r") as fh:
4-
long_description = fh.read()
3+
See:
4+
https://packaging.python.org/en/latest/distributing.html
5+
https://github.com/pypa/sampleproject
6+
"""
57

6-
setuptools.setup(
7-
name="adafruit-rplidar",
8-
version="0.0.1",
9-
author="Dave Astels",
10-
author_email="dastels@daveastels.com",
11-
description="Slamtec RPLIDAR A1 interface",
8+
from setuptools import setup, find_packages
9+
# To use a consistent encoding
10+
from codecs import open
11+
from os import path
12+
13+
here = path.abspath(path.dirname(__file__))
14+
15+
# Get the long description from the README file
16+
with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
17+
long_description = f.read()
18+
19+
setup(
20+
name='adafruit-circuitpython-rplidar',
21+
22+
use_scm_version=True,
23+
setup_requires=['setuptools_scm'],
24+
25+
description='RPLidar support',
1226
long_description=long_description,
13-
long_description_content_type="text/markdown",
14-
url="https://github.com/adafruit/Adafruit_CircuitPython_RPLIDAR",
15-
py_modules=['adafruit_rplidar'],
27+
long_description_content_type='text/x-rst',
28+
29+
# The project's main homepage.
30+
url='https://github.com/adafruit/Adafruit_CircuitPython_rplidar',
31+
32+
# Author details
33+
author='Adafruit Industries',
34+
author_email='circuitpython@adafruit.com',
35+
36+
install_requires=[
37+
'Adafruit-Blinka'
38+
],
39+
40+
# Choose your license
41+
license='MIT',
42+
43+
# See https://pypi.python.org/pypi?%3Aaction=list_classifiers
1644
classifiers=[
17-
"Programming Language :: Python :: 3",
18-
"License :: OSI Approved :: MIT License",
19-
"Operating System :: OS Independent",
45+
'Development Status :: 3 - Alpha',
46+
'Intended Audience :: Developers',
47+
'Topic :: Software Development :: Libraries',
48+
'Topic :: System :: Hardware',
49+
'License :: OSI Approved :: MIT License',
50+
'Programming Language :: Python :: 3',
51+
'Programming Language :: Python :: 3.4',
52+
'Programming Language :: Python :: 3.5',
2053
],
54+
55+
# What does your project relate to?
56+
keywords='adafruit blinka circuitpython micropython rplidar lidar sensors',
57+
58+
# You can just specify the packages manually here if your project is
59+
# simple. Or you can use find_packages().
60+
# TODO: IF LIBRARY FILES ARE A PACKAGE FOLDER,
61+
# CHANGE `py_modules=['...']` TO `packages=['...']`
62+
py_modules=['adafruit_rplidar'],
2163
)

0 commit comments

Comments
 (0)