orcasgit · GhostofOnyx238 · Jul 14, 2021 · Jul 14, 2021
diff --git a/fitbit/api.py b/fitbit/api.py
@@ -20,7 +20,7 @@
 class FitbitOauth2Client(object):
    API_ENDPOINT = "https://api.fitbit.com"
    AUTHORIZE_ENDPOINT = "https://www.fitbit.com"
-    API_VERSION = 1
+    API_VERSION = 1.2

    request_token_url = "%s/oauth2/token" % API_ENDPOINT
    authorization_url = "%s/oauth2/authorize" % AUTHORIZE_ENDPOINT
@@ -188,7 +188,7 @@ class Fitbit(object):
    METRIC = 'en_UK'

    API_ENDPOINT = "https://api.fitbit.com"
-    API_VERSION = 1
+    API_VERSION = 1.2
    WEEK_DAYS = ['SUNDAY', 'MONDAY', 'TUESDAY', 'WEDNESDAY', 'THURSDAY', 'FRIDAY', 'SATURDAY']
    PERIODS = ['1d', '7d', '30d', '1w', '1m', '3m', '6m', '1y', 'max']


diff --git a/gather_keys_oauth2.py → fitbit/gather_keys_oauth2.py b/gather_keys_oauth2.py → fitbit/gather_keys_oauth2.py
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,9 @@
+python-dateutil>=1.5
+requests-oauthlib>=0.7
+cherrypy>=18.6.1
+tox>=1.8,<2.2
+coverage>=3.7,<4.0
+freezegun>=0.3.8
+mock>=1.0
+requests-mock>=1.2.0
+Sphinx>=1.2,<1.4
diff --git a/requirements/base.txt b/requirements/base.txt
diff --git a/requirements/dev.txt b/requirements/dev.txt
diff --git a/requirements/test.txt b/requirements/test.txt
diff --git a/setup.py b/setup.py
@@ -5,8 +5,8 @@

 from setuptools import setup

-required = [line for line in open('requirements/base.txt').read().split("\n") if line != '']
-required_test = [line for line in open('requirements/test.txt').read().split("\n") if not line.startswith("-r") and line != '']
+required = [line for line in open('requirements.txt').read().split("\n") if line != '']
+#required_test = [line for line in open('requirements/test.txt').read().split("\n") if not line.startswith("-r") and line != '']

 fbinit = open('fitbit/__init__.py').read()
 author = re.search("__author__ = '([^']+)'", fbinit).group(1)
@@ -27,7 +27,7 @@
    install_requires=["setuptools"] + required,
    license='Apache 2.0',
    test_suite='fitbit_tests.all_tests',
-    tests_require=required_test,
+    tests_require=required,
    classifiers=(
        'Intended Audience :: Developers',
        'Natural Language :: English',