Skip to content

Commit 755419d

Browse files
RogueMRogueM
committed
Merge remote-tracking branch 'pimoroni/master'
2 parents 9de490e + ba39b2c commit 755419d

10 files changed

Lines changed: 99 additions & 25 deletions

File tree

‎library/CHANGELOG.txt‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
1-
##0.1.1
1+
0.1.2
2+
-----
23

3-
* Increased delay in polling loop to avoid CPU hogging
4+
* Initial commit to Raspbian apt repository
45

5-
##0.0.2
6+
0.1.1
7+
-----
8+
9+
* Increased delay in polling loop to avoid CPU hogging
10+
11+
0.0.2
12+
-----
13+
14+
* Many little bugfixes, for an actually working library
615

7-
* Many little bugfixes, for an actually working library

‎library/LICENSE.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2015 Pimoroni Ltd
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎library/MANIFEST‎

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

‎library/MANIFEST.in‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
include cap1xxx.py
2-
include README.txt
31
include CHANGELOG.txt
42
include LICENSE.txt
3+
include README.txt
54
include setup.py
5+
include cap1xxx.py

‎library/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#Cap1xxx Pure Python Library

‎library/setup.py‎

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env python
2+
23
"""
3-
Copyright (c) 2014 Pimoroni
4+
Copyright (c) 2015 Pimoroni
45
Permission is hereby granted, free of charge, to any person obtaining a copy of
56
this software and associated documentation files (the "Software"), to deal in
67
the Software without restriction, including without limitation the rights to
@@ -18,7 +19,10 @@
1819
SOFTWARE.
1920
"""
2021

21-
from distutils.core import setup
22+
try:
23+
from setuptools import setup
24+
except ImportError:
25+
from distutils.core import setup
2226

2327
classifiers = ['Development Status :: 5 - Production/Stable',
2428
'Operating System :: POSIX :: Linux',
@@ -30,15 +34,17 @@
3034
'Topic :: Software Development',
3135
'Topic :: System :: Hardware']
3236

33-
setup(name = 'Cap1xxx',
34-
version = '0.1.2',
35-
author = 'Philip Howard',
36-
author_email= 'phil@pimoroni.com',
37-
description = 'A module to drive various Microchip cap1xxx touch ICs',
38-
long_description= open('README.txt').read() + open('CHANGELOG.txt').read(),
39-
license = 'MIT',
40-
keywords = 'Raspberry Pi',
41-
url = 'http://shop.pimoroni.com',
42-
classifiers = classifiers,
43-
py_modules = ['cap1xxx']
37+
setup(
38+
name = 'Cap1xxx',
39+
version = '0.1.2',
40+
author = 'Philip Howard',
41+
author_email = 'phil@pimoroni.com',
42+
description = 'A module to drive various Microchip cap1xxx touch ICs',
43+
long_description= open('README.txt').read() + open('CHANGELOG.txt').read(),
44+
license = 'MIT',
45+
keywords = 'Raspberry Pi',
46+
url = 'http://shop.pimoroni.com',
47+
classifiers = classifiers,
48+
py_modules = ['cap1xxx'],
49+
install_requires= []
4450
)

‎packaging/CHANGELOG‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
cap1xxx (0.1.2) UNRELEASED; urgency=low
2+
3+
* Initial commit to Raspbian apt repository
4+
5+
-- Phil Howard <phil@pimoroni.com> Fri, 01 Jul 2016 00:00:00 +0000
6+
7+
cap1xxx (0.1.1) UNRELEASED; urgency=low
8+
9+
* Increased delay in polling loop to avoid CPU hogging
10+
11+
-- Phil Howard <phil@pimoroni.com> Tue, 16 Feb 2016 00:00:00 +0000
12+
13+
cap1xxx (0.0.2) UNRELEASED; urgency=low
14+
15+
* Many little bugfixes, for an actually working library
16+
17+
-- Phil Howard <phil@pimoroni.com> Fri, 05 Jun 2015 00:00:00 +0000

‎packaging/debian/README‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
README
2+
3+
Cap-touch Driver Library for Microchip CAP1xxx ICs. Supports communication over i2c only.
4+
5+
IMPORTANT
6+
7+
the cap1xxx library requires i2c.
8+
To enable run `curl get.pimoroni.com/i2c | bash`
9+
or use raspi-config and reboot your Raspberry Pi.

‎packaging/debian/compat‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
9
2-

‎packaging/makelog.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
3+
mainlog="CHANGELOG"
4+
debianlog="debian/changelog"
5+
pypilog="../library/CHANGELOG.txt"
6+
7+
# generate debian changelog
8+
9+
cat $mainlog > $debianlog
10+
11+
# generate pypi changelog
12+
13+
sed -e "/--/d" -e "s/ \*/\*/" \
14+
-e "s/.*\([0-9].[0-9].[0-9]\).*/\1/" \
15+
-e '/[0-9].[0-9].[0-9]/ a\
16+
-----' $mainlog | cat -s > $pypilog
17+
18+
exit 0

0 commit comments

Comments
 (0)