[med-svn] [galileo] 01/05: Imported Upstream version 0.5
Dylan Aïssi
bob.dybian-guest at moszumanska.debian.org
Fri Jul 22 22:52:01 UTC 2016
This is an automated email from the git hooks/post-receive script.
bob.dybian-guest pushed a commit to branch master
in repository galileo.
commit 2bab5732b65c3cca603fd16490f4874133cc2629
Author: Dylan Aïssi <bob.dybian at gmail.com>
Date: Sat Jul 23 00:40:20 2016 +0200
Imported Upstream version 0.5
---
.hg_archival.txt | 6 ++----
CHANGES | 10 +++++++---
README.txt | 16 ++++++++++++++--
doc/galileo.1 | 2 +-
doc/galileorc.5 | 2 +-
galileo/__init__.py | 2 +-
galileo/dongle.py | 3 ++-
galileo/main.py | 2 +-
galileo/tracker.py | 2 --
setup.py | 8 ++++----
tests/testFitbitClient.py | 4 +---
11 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/.hg_archival.txt b/.hg_archival.txt
index f7f43d2..667c429 100644
--- a/.hg_archival.txt
+++ b/.hg_archival.txt
@@ -1,6 +1,4 @@
repo: f439ecfadaa724fc313310f8531884bec45c286c
-node: 8b923a5d4d22e3f7626f13d396b53f525ad77dfa
+node: 1b2fc31c42a13be65326591e12d2b5d25c79ed34
branch: default
-latesttag: 0.4.4
-latesttagdistance: 21
-changessincelatesttag: 208
+tag: 0.5
diff --git a/CHANGES b/CHANGES
index 6869c6e..0981ea0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,13 +1,16 @@
-galileo 0.5 (????-??-??)
+galileo 0.5 (2016-07-22)
------------------------
This is the next feature release of galileo, a free utility to securely
synchronize fitbit bluetooth trackers with the fitbit web-service.
-This release ...
+This release is a great improvement over the 0.4 branch. It add support
+for python 3 as well as rework the communication layer to get rid of timeout
+as exceptions.
Contributor to this release: Dean Giberson, Richard Weait, Chris Wayne,
-David Vasak, Mike Frysinger and Nenad Jankovic.
+David Vasak, Mike Frysinger, Nenad Jankovic, pozorvlak, Dylan Aïssi and
+Antenore Gatta.
Main changes since 0.4.4:
- Add a pair mode (issue#33)
@@ -20,6 +23,7 @@ Main changes since 0.4.4:
- Improve Discovery process (issue#231)
- Add Support for python 3.4 (issue#116)
- Add support for newer dongles (issue#236)
+- Update the server name (issue#277)
galileo 0.4.4 (2015-05-31)
diff --git a/README.txt b/README.txt
index c887e09..7070c52 100644
--- a/README.txt
+++ b/README.txt
@@ -2,7 +2,7 @@ Galileo
=======
:author: Benoît Allard <benoit.allard at gmx.de>
-:version: 0.5dev
+:version: 0.5
:license: LGPLv3+
:bug tracker: https://bitbucket.org/benallard/galileo/issues
:mailing list: galileo at freelists.org (subscribe_, archive_)
@@ -29,6 +29,10 @@ All Bluetooth-based trackers are supported. Those are:
- Fitbit Charge
- Fitbit Charge HR
+.. note:: The newer Trackers: Alta, Surge, and Blaze are **not supported**
+ due to a change in the network communication protocol.
+ Help with dumps is welcome !
+
.. note:: The Fitbit Ultra tracker is **not supported** as it communicates
using the ANT protocol. To synchronize it, please use libfitbit_.
@@ -84,19 +88,27 @@ The following Linux distributions have packages available for installation:
`squeezebox <http://git.overlays.gentoo.org/gitweb/?p=user/squeezebox.git>`_
overlay. See https://wiki.gentoo.org/wiki/Layman for details of how
to use Gentoo overlays.
+**Debian**:
+ galileo is now officially part of the sid_ distribution.
**Ubuntu**:
The utility is available over the ppa ``ppa:cwayne18/fitbit``. Use the
following commands to install it and start the daemon::
sudo add-apt-repository ppa:cwayne18/fitbit
sudo apt-get update && sudo apt-get install galileo
- start galileo
+ start galileo
+
+ .. note: This ppa has no support for newer Ubuntu releases. There are
+ reports that the Debian package (see above) can be installed there
+ though.
.. _AUR: https://aur.archlinux.org/packages/galileo/
.. _yaourt: https://wiki.archlinux.org/index.php/yaourt
.. _`COPR repo`: https://copr.fedoraproject.org/coprs/stbenjam/galileo/
+.. _sid: https://packages.debian.org/sid/main/galileo
+
The more complicated way
~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/galileo.1 b/doc/galileo.1
index d1afc47..a703ab0 100644
--- a/doc/galileo.1
+++ b/doc/galileo.1
@@ -4,7 +4,7 @@
.\" groff -man -Tascii galileo.1
.\" or
.\" man ./galileo.1
-.TH galileo 1 "June 2014" 0.5dev "User Commands"
+.TH galileo 1 "June 2014" 0.5 "User Commands"
.SH NAME
galileo \- synchronize Fitbit devices
diff --git a/doc/galileorc.5 b/doc/galileorc.5
index 876772a..b56f329 100644
--- a/doc/galileorc.5
+++ b/doc/galileorc.5
@@ -4,7 +4,7 @@
.\" groff -man -Tascii galileorc.5
.\" or
.\" man ./galileorc.5
-.TH galileorc 5 "June 2014" 0.5dev "File Formats Manual"
+.TH galileorc 5 "June 2014" 0.5 "File Formats Manual"
.SH NAME
galileorc \- configuration files for the galileo Fitbit synchronization
diff --git a/galileo/__init__.py b/galileo/__init__.py
index 883bb2c..efa194d 100644
--- a/galileo/__init__.py
+++ b/galileo/__init__.py
@@ -2,4 +2,4 @@
galileo.py Utility to synchronize a fitbit tracker with the fitbit server.
"""
-__version__ = '0.5dev'
+__version__ = '0.5'
diff --git a/galileo/dongle.py b/galileo/dongle.py
index 660fde8..56b8b28 100644
--- a/galileo/dongle.py
+++ b/galileo/dongle.py
@@ -233,7 +233,8 @@ class FitBitDongle(USBDevice):
self.major = major
self.minor = minor
self.hasVersion = True
- self.establishLinkEx = (major, minor) >= (7, 5)
+ # Leave it to False, I don't see any advantage in using it at the moment
+ # self.establishLinkEx = (major, minor) >= (2, 5)
logger.debug('Fitbit dongle version major:%d minor:%d', self.major,
self.minor)
diff --git a/galileo/main.py b/galileo/main.py
index eb1e7e3..606c0ae 100644
--- a/galileo/main.py
+++ b/galileo/main.py
@@ -34,7 +34,7 @@ def syncAllTrackers(config):
fitbit = FitbitClient(dongle)
- galileo = GalileoClient('https', 'client.fitbit.com',
+ galileo = GalileoClient('https', 'api.fitbit.com',
'tracker/client/message')
if not fitbit.disconnect():
diff --git a/galileo/tracker.py b/galileo/tracker.py
index c54aa11..cc3f294 100644
--- a/galileo/tracker.py
+++ b/galileo/tracker.py
@@ -196,8 +196,6 @@ class FitbitClient(object):
for n in nums:
data.extend(i2lsba(n, 2))
self.dongle.ctrl_write(CM(0x12, data))
- if not isStatus(self.dongle.ctrl_read(), 'CancelDiscovery'):
- return False
if not isStatus(self.dongle.ctrl_read(), 'EstablishLinkEx'):
return False
d = self.dongle.ctrl_read(5000)
diff --git a/setup.py b/setup.py
index 65aecdb..b446c70 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,8 @@
# -*- coding: utf-8 -*-
import re
-import sys
+
+from io import open
try:
from setuptools import setup, find_packages, Command
@@ -18,13 +19,12 @@ class CheckVersion(Command):
""" Check that the version in the docs is the correct one """
description = "Check the version consistency"
user_options = []
+
def initialize_options(self):
"""init options"""
- pass
def finalize_options(self):
"""finalize options"""
- pass
def run(self):
readme_re = re.compile(r'^:version:\s+' + __version__ + r'\s*$',
@@ -40,7 +40,7 @@ class CheckVersion(Command):
if regex.search(content) is None:
raise ValueError('file %s mention the wrong version' % filename)
-with open('README.txt') as file:
+with open('README.txt', encoding='utf8') as file:
long_description = file.read()
setup(
diff --git a/tests/testFitbitClient.py b/tests/testFitbitClient.py
index ca0b10a..fb59d5e 100644
--- a/tests/testFitbitClient.py
+++ b/tests/testFitbitClient.py
@@ -303,8 +303,7 @@ class testGetDongleInfo(unittest.TestCase):
class testestablishLink(unittest.TestCase):
def testestablishLinkExOk(self):
- d = MyDongle([(0x20, 1, 0x43, 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x44, 0x69, 0x73, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0),
- (0x20, 1, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6C, 0x69, 0x73, 0x68, 0x4C, 0x69, 0x6E, 0x6B, 0x45, 0x78, 0x20, 0x63, 0x61, 0x6C, 0x6C, 0x65, 0x64, 0x2E, 0x2E, 0x2E, 0x00),
+ d = MyDongle([(0x20, 1, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6C, 0x69, 0x73, 0x68, 0x4C, 0x69, 0x6E, 0x6B, 0x45, 0x78, 0x20, 0x63, 0x61, 0x6C, 0x6C, 0x65, 0x64, 0x2E, 0x2E, 0x2E, 0x00),
(3, 4, 0),
(0x20, 1, 0x47, 0x41, 0x50, 0x5F, 0x4C, 0x49, 0x4E, 0x4B, 0x5F, 0x45, 0x53, 0x54, 0x41, 0x42, 0x4C, 0x49, 0x53, 0x48, 0x45, 0x44, 0x5F, 0x45, 0x56, 0x45, 0x4E, 0x54, 0),
(2, 7),])
@@ -318,7 +317,6 @@ class testestablishLink(unittest.TestCase):
def testestablishLinkExNotOk(self):
""" When our version test is wrong """
d = MyDongle([(4, 0xff, 2, 3),
- (0x20, 1, 0x43, 0x61, 0x6E, 0x63, 0x65, 0x6C, 0x44, 0x69, 0x73, 0x63, 0x6F, 0x76, 0x65, 0x72, 0x79, 0),
(0x20, 1, 0x45, 0x73, 0x74, 0x61, 0x62, 0x6C, 0x69, 0x73, 0x68, 0x4C, 0x69, 0x6E, 0x6B, 0x45, 0x78, 0x20, 0x63, 0x61, 0x6C, 0x6C, 0x65, 0x64, 0x2E, 0x2E, 0x2E, 0),
(3, 4, 0),
(0x20, 1, 0x47, 0x41, 0x50, 0x5F, 0x4C, 0x49, 0x4E, 0x4B, 0x5F, 0x45, 0x53, 0x54, 0x41, 0x42, 0x4C, 0x49, 0x53, 0x48, 0x45, 0x44, 0x5F, 0x45, 0x56, 0x45, 0x4E, 0x54, 0),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/galileo.git
More information about the debian-med-commit
mailing list