From 3dc6a7c4aa9d08b6da635ba52c9f24e0438dc5c2 Mon Sep 17 00:00:00 2001 From: clach04 Date: Mon, 25 Jul 2022 17:58:05 -0700 Subject: [PATCH 1/4] Working Python 2.7 support under Microsoft Windows Tested with: Python 2.7.10 (default, May 23 2015, 09:40:32) [MSC v.1500 32 bit (Intel)] on win32 --- README.md | 8 ++++++++ requirements.txt | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..fcdec15 --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# Pebble build tool + +To install, from a checkout, issue: + + python -m pip install -r requirements.txt + +Definitely works with Python 2.7. + diff --git a/requirements.txt b/requirements.txt index 125fb37..2590783 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ -libpebble2==0.0.26 +#libpebble2==0.0.28 +git+https://github.com/pebble-dev/libpebble2.git@685cd9841e647b48609ce904a87540019390b3be#egg=libpebble2 enum34==1.0.4 httplib2==0.19.0 oauth2client==1.4.12 @@ -16,3 +17,4 @@ websocket-client==0.32.0 wheel==0.24.0 colorama==0.3.3 packaging==16.7 +pyreadline==2.1 From 72f3a37c9fd1e8242a23e6079ccdedc7f0201852 Mon Sep 17 00:00:00 2001 From: clach04 Date: Sat, 22 Jul 2023 11:30:00 -0700 Subject: [PATCH 2/4] Fix two thirds of review comments This commit is untested. --- README.md | 2 +- requirements.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fcdec15..1b25a12 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pebble build tool +# Pebble Tool To install, from a checkout, issue: diff --git a/requirements.txt b/requirements.txt index 2590783..6e58071 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ -#libpebble2==0.0.28 -git+https://github.com/pebble-dev/libpebble2.git@685cd9841e647b48609ce904a87540019390b3be#egg=libpebble2 +libpebble2==0.0.28 enum34==1.0.4 httplib2==0.19.0 oauth2client==1.4.12 From 54af7a7d88604f5b05b3be4f0f371f6ab6bc30f8 Mon Sep 17 00:00:00 2001 From: clach04 Date: Sat, 22 Jul 2023 12:06:31 -0700 Subject: [PATCH 3/4] Fix issues with setup.py - possibly Windows specific Match versions in setup.py with (working) requirements.txt. When ran from setup.py httplib2 would pull in pyparsing 3.1.0 rather than 2.4.7. This does not happen with pip install of requirements.txt, manually added pyparsing with pinned version number. --- README.md | 6 ++++++ requirements.txt | 1 + setup.py | 5 +++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b25a12..edf1e67 100644 --- a/README.md +++ b/README.md @@ -4,5 +4,11 @@ To install, from a checkout, issue: python -m pip install -r requirements.txt +or: + + python setup.py develop + python setup.py install + + Definitely works with Python 2.7. diff --git a/requirements.txt b/requirements.txt index 6e58071..d3dc61c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,6 @@ libpebble2==0.0.28 enum34==1.0.4 +pyparsing==2.4.7 httplib2==0.19.0 oauth2client==1.4.12 progressbar2==2.7.3 diff --git a/setup.py b/setup.py index e94e9ac..d366a49 100644 --- a/setup.py +++ b/setup.py @@ -4,8 +4,9 @@ from setuptools import setup, find_packages requires = [ - 'libpebble2==0.0.26', - 'httplib2==0.9.1', + 'pyparsing==2.4.7', + 'libpebble2==0.0.28', + 'httplib2==0.19.0', 'oauth2client==1.4.12', 'progressbar2==2.7.3', 'pyasn1==0.1.8', From b5cbbd1a64cac5084044b5ae7ebfa2ac99bf7424 Mon Sep 17 00:00:00 2001 From: clach04 Date: Sat, 22 Jul 2023 12:09:37 -0700 Subject: [PATCH 4/4] Include pyreadline in setup.py to match requirements.txt --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index d366a49..5345e47 100644 --- a/setup.py +++ b/setup.py @@ -22,6 +22,7 @@ 'wheel==0.24.0', 'colorama==0.3.3', 'packaging==16.7', + 'pyreadline==2.1', ] if sys.version_info < (3, 4, 0):