From 9ca2b4371394701c1fb9b4b1e5c876696cb5e1dd Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 21 Mar 2020 17:12:45 +0000 Subject: [PATCH 01/10] Add gitpod config this commit adds support for Gitpod.io, a free automated dev environment that makes contributing and generally working on GitHub projects much easier. It allows anyone to start a ready-to-code dev environment for any branch, issue and pull request with a single click. --- .gitpod.Dockerfile | 10 ++++++++++ .gitpod.yml | 4 ++++ README.md | 3 +++ 3 files changed, 17 insertions(+) create mode 100644 .gitpod.Dockerfile create mode 100644 .gitpod.yml diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile new file mode 100644 index 0000000000..bea40f0e4d --- /dev/null +++ b/.gitpod.Dockerfile @@ -0,0 +1,10 @@ +FROM gitpod/workspace-full + +USER gitpod + +# Install custom tools, runtime, etc. using apt-get +# For example, the command below would install "bastet" - a command line tetris clone: +# +# RUN sudo apt-get -q update && # sudo apt-get install -yq bastet && # sudo rm -rf /var/lib/apt/lists/* +# +# More information: https://www.gitpod.io/docs/config-docker/ diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000000..daa8a83dc0 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,4 @@ +tasks: + - init: pip install -r ./requirements.txt +image: + file: .gitpod.Dockerfile diff --git a/README.md b/README.md index 337a361667..a4027aab28 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,9 @@ Details and discussion are on the "Experimental" section of the forum: https://w Automated builds of the (new) documentation can be found at [ESPEasy.readthedocs.io](https://espeasy.readthedocs.io/en/latest/) +[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/letscontrolit/ESPEasy) + + ## Icons used Icons on courtesy of [ICONS8](https://icons8.com/). From 1093e37af8b13c1d58bb18d2d67648d9fa6d7833 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 21 Mar 2020 17:54:36 +0000 Subject: [PATCH 02/10] Sanitize Requirements.txt and switch to Python 3.8 --- .travis.yml | 10 +++------- requirements.txt | Bin 1126 -> 531 bytes 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b0926b69e..43859b416f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,13 @@ language: python python: - - '2.7' + - '3.8' #we want a newer cppcheck, so use trusty dist: bionic sudo: false -cache: - directories: - # - "~/.platformio" - # - "./.pio" - - +cache: false addons: apt: @@ -23,6 +18,7 @@ addons: install: - pip install -U platformio sphinx recommonmark sphinx_bootstrap_theme + - platformio update script: - platformio update diff --git a/requirements.txt b/requirements.txt index bf18c2d7b9336e8cdfa8217e4e6a0f649d988f39..7ebac23eb8fe18a4a2dc01fab9cc21900c4b00fd 100644 GIT binary patch literal 531 zcmXw0%WlIU5WMp*Mh543;L_YGRjQOPSO`gIcoo)7ov-gg(xaJ~of!{!&`{A9rAEHx zLNY)sRVlIOf{*MCwDn3!!bYYOqPLAHBo|v|Y(aN+1dl}DaIs}SNuOz zTO3gRiPGf-AFrm86>EC@@QS~pg2jH%wm$DkNe|Tqi0I7lW9e>+y$Tsu_uFf9PE2mzl6%RCHf=-9#e1ixMwe^C{{Vv|poIVc literal 1126 zcmZWoNlwE+5bQG&Pe~Lz8yvWh8xj&yUSK<$!5iZV0Ui%jbqj3noU>kZZAATFtG%9hu2W z?xkiIs_Lbb9iA~vg2qB|i-0>o$H@kGued3qbUM@c3i_oK@}e=iHwOhARCo^AHC}Wv zQ*QcSAzI^WrIAO~Fb;Ch&-@$23pql&1fO++h(s~grxNa(purk%)LE&zd-(2=`x!cs zXl``*fJh_H$W22J$ZY)d7=0b3lQmGgKP-tVb%?M7ne3HsuUv6n2ZKIS&)&{CHc#^&G*? OPEdDx)=2d#jN=EhU8EEM From f2266c1e38a4b71ba231de0b03195f25c3f1fc4a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 21 Mar 2020 18:12:45 +0000 Subject: [PATCH 03/10] Add Gitpod extensions --- .gitpod.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitpod.yml b/.gitpod.yml index daa8a83dc0..722cf899c1 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,3 +2,10 @@ tasks: - init: pip install -r ./requirements.txt image: file: .gitpod.Dockerfile + +vscode: + extensions: + - platformio.platformio-ide@1.10.0:aIt2v3YhW3veGlO/Uthh3Q== + - laurenttreguier.uncrustify + - coenraads.bracket-pair-colorizer-2 + - eamodio.gitlens From 31112228b74567f3eb41f99eb9aa10c9140fa792 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 21 Mar 2020 18:41:08 +0000 Subject: [PATCH 04/10] Add VSCode Extentions --- .gitpod.yml | 8 +++++--- .theia/settings.json | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 .theia/settings.json diff --git a/.gitpod.yml b/.gitpod.yml index 722cf899c1..18c11f2e94 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -5,7 +5,9 @@ image: vscode: extensions: + - ms-vscode.cpptools@0.26.3:u3GsZ5PK12Ddr79vh4TWgQ== - platformio.platformio-ide@1.10.0:aIt2v3YhW3veGlO/Uthh3Q== - - laurenttreguier.uncrustify - - coenraads.bracket-pair-colorizer-2 - - eamodio.gitlens + - eamodio.gitlens@10.2.1:e0IYyp0efFqVsrZwsIe8CA== + - CoenraadS.bracket-pair-colorizer-2@0.0.29:Y00hDi6uxq/5AWl637owFQ== + - LaurentTreguier.uncrustify@2.18.0:/k8Osjj/XSuz09F+pEu7wg== + - Atishay-Jain.All-Autocomplete@0.0.23:fbZNfSpnd8XkAHGfAPS2rA== \ No newline at end of file diff --git a/.theia/settings.json b/.theia/settings.json new file mode 100644 index 0000000000..df371ebaed --- /dev/null +++ b/.theia/settings.json @@ -0,0 +1,3 @@ +{ + "extensions.showRecommendationsOnlyOnDemand": true +} \ No newline at end of file From af07b92bcf40e1ee4d1caaa418644f80f7a7f031 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 21 Mar 2020 20:06:23 +0000 Subject: [PATCH 05/10] Change bracket pair colorizer for one that installs in GitPod --- .gitpod.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 18c11f2e94..1f914ad300 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,5 +1,6 @@ tasks: - - init: pip install -r ./requirements.txt + - init: python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/develop/scripts/get-platformio.py)" && brew install uncrustify && pip install -r ./requirements.txt + image: file: .gitpod.Dockerfile @@ -8,6 +9,6 @@ vscode: - ms-vscode.cpptools@0.26.3:u3GsZ5PK12Ddr79vh4TWgQ== - platformio.platformio-ide@1.10.0:aIt2v3YhW3veGlO/Uthh3Q== - eamodio.gitlens@10.2.1:e0IYyp0efFqVsrZwsIe8CA== - - CoenraadS.bracket-pair-colorizer-2@0.0.29:Y00hDi6uxq/5AWl637owFQ== - LaurentTreguier.uncrustify@2.18.0:/k8Osjj/XSuz09F+pEu7wg== - - Atishay-Jain.All-Autocomplete@0.0.23:fbZNfSpnd8XkAHGfAPS2rA== \ No newline at end of file + - Atishay-Jain.All-Autocomplete@0.0.23:fbZNfSpnd8XkAHGfAPS2rA== + - 2gua.rainbow-brackets@0.0.6:Tbu8dTz0i+/bgcKQTQ5b8g== \ No newline at end of file From 81c699938c8a0eb4e2ea6dfd768ce690025b3e6a Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 21 Mar 2020 20:29:55 +0000 Subject: [PATCH 06/10] Remove PlatformIO Extension from GitPod.yml --- .gitpod.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 1f914ad300..979fa21394 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -7,7 +7,6 @@ image: vscode: extensions: - ms-vscode.cpptools@0.26.3:u3GsZ5PK12Ddr79vh4TWgQ== - - platformio.platformio-ide@1.10.0:aIt2v3YhW3veGlO/Uthh3Q== - eamodio.gitlens@10.2.1:e0IYyp0efFqVsrZwsIe8CA== - LaurentTreguier.uncrustify@2.18.0:/k8Osjj/XSuz09F+pEu7wg== - Atishay-Jain.All-Autocomplete@0.0.23:fbZNfSpnd8XkAHGfAPS2rA== From 713bb4473375f650801911afbdf46fbd672d4c3d Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 12 Sep 2020 15:51:33 +0200 Subject: [PATCH 07/10] Restore Requirements.txt after merge --- requirements.txt | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/requirements.txt b/requirements.txt index e69de29bb2..690d5064f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -0,0 +1,39 @@ +alabaster==0.7.12 +argh==0.26.2 +Babel==2.8.0 +bottle==0.12.18 +cached-property==1.5.1 +certifi==2020.6.20 +cffi==1.14.1 +chardet==3.0.4 +click==7.1.2 +colorama==0.4.3 +commonmark==0.9.1 +docutils==0.16 +idna==2.10 +imagesize==1.2.0 +Jinja2==2.11.2 +livereload==2.6.2 +MarkupSafe==1.1.1 +marshmallow==3.7.1 +packaging==20.4 +pathtools==0.1.2 +platformio>=5.0.1 +port-for==0.3.1 +pycparser==2.20 +pyelftools==0.26 +pygit2==1.2.1 +Pygments==2.6.1 +pyparsing==2.4.7 +pyserial==3.4 +pytz==2020.1 +PyYAML==5.3.1 +recommonmark==0.6.0 +requests==2.24.0 +semantic-version==2.8.5 +six==1.15.0 +snowballstemmer==2.0.0 +tabulate==0.8.7 +tornado==6.0.4 +urllib3==1.25.10 +watchdog==0.10.3 From 50f0b28a96e897ff52300904f3a588e389ce828d Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 12 Sep 2020 16:08:52 +0200 Subject: [PATCH 08/10] [Gitpod] Use pip3 as we need Python3 --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 979fa21394..fd215856d0 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,5 +1,5 @@ tasks: - - init: python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/develop/scripts/get-platformio.py)" && brew install uncrustify && pip install -r ./requirements.txt + - init: python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/develop/scripts/get-platformio.py)" && brew install uncrustify && pip3 install -r ./requirements.txt image: file: .gitpod.Dockerfile From e49e221c191381d12ea61e6d3660edea81904859 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 12 Sep 2020 16:18:40 +0200 Subject: [PATCH 09/10] [Gitpod] Change init: into before: --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index fd215856d0..3d884ae2b5 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,5 +1,5 @@ tasks: - - init: python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/develop/scripts/get-platformio.py)" && brew install uncrustify && pip3 install -r ./requirements.txt + - before: python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/develop/scripts/get-platformio.py)" && brew install uncrustify && pip3 install -r ./requirements.txt image: file: .gitpod.Dockerfile From 3fea6bfe92b4257e6324d205778f074c59d98954 Mon Sep 17 00:00:00 2001 From: TD-er Date: Sat, 12 Sep 2020 18:03:09 +0200 Subject: [PATCH 10/10] [Gitpod] Apparently Gitpod still uses Python 2.7 pip install -U platformio to make it Python version independent. --- .gitpod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitpod.yml b/.gitpod.yml index 3d884ae2b5..cddef1b0de 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,5 +1,5 @@ tasks: - - before: python3 -c "$(curl -fsSL https://raw.githubusercontent.com/platformio/platformio/develop/scripts/get-platformio.py)" && brew install uncrustify && pip3 install -r ./requirements.txt + - before: pip install -U platformio && brew install uncrustify && pip3 install -r ./requirements.txt image: file: .gitpod.Dockerfile