From 5d3ec1db70ba1aa41312dc5db73d94f983584340 Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Tue, 12 Mar 2024 09:23:11 +0000 Subject: [PATCH 01/17] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 3bb7f35..c9e943b 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ Try the statistics-resampling package online in a Notebook with an **Octave** kernel within Jupyter Lab using Binder by clicking the launch-binder button: -[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/acpennlab/statistics-resampling-online/master?labpath=statistics-resampling.ipynb) (default branch: master) - [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/acpennlab/statistics-resampling-online/jammy?labpath=statistics-resampling.ipynb) (stable branch: jammy) Note that the first time you access statistics-resampling-online (since the last commit at the GitHub repository) it may take a while to build, but frequent access to statistics-resampling-online thereon should give load times less than a minute. Data files (.tsv and .csv) can be conveniently modified using the [jupyterlab-spreadsheet-editor](https://jupyterlab-contrib.github.io/jupyterlab-spreadsheet-editor.html) included in this environment. Other Jupyter Lab extensions included enable the creation and editing of diagrams and LaTeX documents. The environment also includes kernels to run workbooks in **Julia**, **Python** and **R** (in which additional packages and modules can be installed with Pkg, pip, or from CRAN respectively). Preferably, pre-built packages can also be installed from within code cells of a notebook by executing the system command `!conda install -qc conda-forge `, where `` is replaced with the name of a [conda-forge package](https://conda-forge.org/packages/). From ebc65a27ed81924192d7703a9744c5d124ddba4e Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Tue, 12 Mar 2024 21:06:09 +0000 Subject: [PATCH 02/17] Update environment.yml --- .binder/environment.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.binder/environment.yml b/.binder/environment.yml index 7b372e8..3c76030 100644 --- a/.binder/environment.yml +++ b/.binder/environment.yml @@ -23,6 +23,18 @@ dependencies: - r-essentials == 4.1 - r-markdown == 1.7 - r-bootstrap == 2019.6 + - r-png == 0.1_8 + - r-ggforce == 0.4.1 + - r-gridextra == 2.3 + - r-gridsvg == 1.7_5 + - r-hmisc == 5.1_0 + - r-ggsignif == 0.6.4 + - r-emmeans == 1.8.6 + - r-car == 3.1_2 + - r-lmperm == 2.1.0 + - r-lme4 == 1.1_33 + - r-lmertest == 3.1_3 + - r-parameters == 0.21.1 # Jupyter Lab extensions - jupyterlab-spreadsheet-editor == 0.6.1 - jupyterlab-drawio == 0.9.0 From 76cb569232c7c3bc4ae357498c66d10d68dd53fa Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 08:40:11 +0000 Subject: [PATCH 03/17] Update environment.yml --- .binder/environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.binder/environment.yml b/.binder/environment.yml index 3c76030..db332fc 100644 --- a/.binder/environment.yml +++ b/.binder/environment.yml @@ -20,6 +20,7 @@ dependencies: - plotnine == 0.13.0 # R (including package manager) # R 4.1.3 is the latest version to use R_GE_version == 14, which is compatible with RStudio server 2022.12.0+353 on binder + # Packages not available via conda-forge are installed using install.R - r-essentials == 4.1 - r-markdown == 1.7 - r-bootstrap == 2019.6 From c186757ade475cd50961ad0571c0984c30661fcd Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 08:40:26 +0000 Subject: [PATCH 04/17] Add files via upload --- .binder/install.R | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .binder/install.R diff --git a/.binder/install.R b/.binder/install.R new file mode 100644 index 0000000..650b53b --- /dev/null +++ b/.binder/install.R @@ -0,0 +1,2 @@ +install.packages('lmboot') +install.packages('coin') \ No newline at end of file From e18b62663ab7ef56cfe0d265e7ed1ccf24e3c0fc Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 14:28:30 +0000 Subject: [PATCH 05/17] Delete .binder/install.R --- .binder/install.R | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .binder/install.R diff --git a/.binder/install.R b/.binder/install.R deleted file mode 100644 index 650b53b..0000000 --- a/.binder/install.R +++ /dev/null @@ -1,2 +0,0 @@ -install.packages('lmboot') -install.packages('coin') \ No newline at end of file From 1eaecf9f8378277a94973f7f298fb0ba156d5efe Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 20:51:28 +0000 Subject: [PATCH 06/17] Update postBuild --- .binder/postBuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.binder/postBuild b/.binder/postBuild index 209f44b..d6c7b7e 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -17,3 +17,6 @@ micromamba run -n notebook octave-cli --eval 'pkg install "https://downloads.sou micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/apjanke/octave-tablicious/releases/download/v0.4.2/tablicious-0.4.2.tar.gz"' micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gnu-octave/statistics/archive/refs/tags/release-1.6.5.tar.gz"' micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gnu-octave/statistics-resampling/archive/refs/tags/5.5.7.tar.gz"' + +# Installation of R packages that are not avalable through conda-forge. +micromamba run -n notebook R -e 'install.packages(c("lmboot", "coin","lmeresampler"))' From 59615e3a30d6945b90245b4929fa6799a097f1f9 Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:01:19 +0000 Subject: [PATCH 07/17] Update postBuild --- .binder/postBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.binder/postBuild b/.binder/postBuild index d6c7b7e..ef06805 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -19,4 +19,4 @@ micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gn micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gnu-octave/statistics-resampling/archive/refs/tags/5.5.7.tar.gz"' # Installation of R packages that are not avalable through conda-forge. -micromamba run -n notebook R -e 'install.packages(c("lmboot", "coin","lmeresampler"))' +micromamba run -n notebook micromamba run -n notebook R -e 'install.packages(c("lmboot", "coin","lmeresampler"), repos = "http://cran.uk.r-project.org", dependencies=TRUE)' From bf5f31103fd008ad844427dce257cba719be4e1e Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:12:08 +0000 Subject: [PATCH 08/17] Update postBuild --- .binder/postBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.binder/postBuild b/.binder/postBuild index ef06805..eb8621a 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -19,4 +19,4 @@ micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gn micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gnu-octave/statistics-resampling/archive/refs/tags/5.5.7.tar.gz"' # Installation of R packages that are not avalable through conda-forge. -micromamba run -n notebook micromamba run -n notebook R -e 'install.packages(c("lmboot", "coin","lmeresampler"), repos = "http://cran.uk.r-project.org", dependencies=TRUE)' +micromamba run -n notebook micromamba run -n notebook R -e 'install.packages(c("lmboot"), repos = "http://cran.uk.r-project.org", dependencies=TRUE)' From f8349d7a830ab4ec5ddb74b68a159094f1f65da1 Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:12:19 +0000 Subject: [PATCH 09/17] Update postBuild --- .binder/postBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.binder/postBuild b/.binder/postBuild index eb8621a..51be40f 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -19,4 +19,4 @@ micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gn micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gnu-octave/statistics-resampling/archive/refs/tags/5.5.7.tar.gz"' # Installation of R packages that are not avalable through conda-forge. -micromamba run -n notebook micromamba run -n notebook R -e 'install.packages(c("lmboot"), repos = "http://cran.uk.r-project.org", dependencies=TRUE)' +micromamba run -n notebook micromamba run -n notebook R -e 'install.packages(c("lmboot"), repos = "http://cran.uk.r-project.org")' From 521c4305131b7c4096ee67b93f807ed2290f4fb3 Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:16:51 +0000 Subject: [PATCH 10/17] Update postBuild --- .binder/postBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.binder/postBuild b/.binder/postBuild index 51be40f..93e4285 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -19,4 +19,4 @@ micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gn micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gnu-octave/statistics-resampling/archive/refs/tags/5.5.7.tar.gz"' # Installation of R packages that are not avalable through conda-forge. -micromamba run -n notebook micromamba run -n notebook R -e 'install.packages(c("lmboot"), repos = "http://cran.uk.r-project.org")' +micromamba run -n notebook micromamba run -n notebook R -e 'install.packages(c("lmboot"), repos="http://cran.uk.r-project.org")' From f7f24b80105f886bde10f02c4d5b35f38f3ff634 Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:17:26 +0000 Subject: [PATCH 11/17] Update environment.yml --- .binder/environment.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.binder/environment.yml b/.binder/environment.yml index db332fc..6293261 100644 --- a/.binder/environment.yml +++ b/.binder/environment.yml @@ -30,12 +30,13 @@ dependencies: - r-gridsvg == 1.7_5 - r-hmisc == 5.1_0 - r-ggsignif == 0.6.4 - - r-emmeans == 1.8.6 - r-car == 3.1_2 - r-lmperm == 2.1.0 - r-lme4 == 1.1_33 - r-lmertest == 3.1_3 - r-parameters == 0.21.1 + - r-emmeans == 1.8.6 + - r-multcomp # Jupyter Lab extensions - jupyterlab-spreadsheet-editor == 0.6.1 - jupyterlab-drawio == 0.9.0 From df80f3a7a6f3c9d926c5d374209d05314a2c96cb Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:52:21 +0000 Subject: [PATCH 12/17] Update postBuild --- .binder/postBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.binder/postBuild b/.binder/postBuild index 93e4285..826c817 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -19,4 +19,4 @@ micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gn micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gnu-octave/statistics-resampling/archive/refs/tags/5.5.7.tar.gz"' # Installation of R packages that are not avalable through conda-forge. -micromamba run -n notebook micromamba run -n notebook R -e 'install.packages(c("lmboot"), repos="http://cran.uk.r-project.org")' +micromamba run -n notebook Rscript -e 'install.packages(c("lmboot"),repos="https://cloud.r-project.org", lib="/srv/conda/envs/notebook/lib/R/library")' From 690b412e8f4608240f77062cd2065e27246a596f Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:56:29 +0000 Subject: [PATCH 13/17] Update postBuild --- .binder/postBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.binder/postBuild b/.binder/postBuild index 826c817..18fb6e5 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -6,7 +6,7 @@ set -o nounset # Uninstall jupyter-offlinenotebook extension since the 'Download' button function is buggy # Download from the 'File' menu instead -micromamba remove -yn notebook jupyter-offlinenotebook +# micromamba remove -yn notebook jupyter-offlinenotebook # Installation of Octave packages is dependent on current user. # This works because postBuild user is the same as user running Binder. From 7af7cfafce434997bc483a5f72e5c6c8fd7da1d7 Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 22:55:15 +0000 Subject: [PATCH 14/17] Update postBuild --- .binder/postBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.binder/postBuild b/.binder/postBuild index 18fb6e5..b70449a 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -19,4 +19,4 @@ micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gn micromamba run -n notebook octave-cli --eval 'pkg install "https://github.com/gnu-octave/statistics-resampling/archive/refs/tags/5.5.7.tar.gz"' # Installation of R packages that are not avalable through conda-forge. -micromamba run -n notebook Rscript -e 'install.packages(c("lmboot"),repos="https://cloud.r-project.org", lib="/srv/conda/envs/notebook/lib/R/library")' +micromamba run -n notebook Rscript -e 'install.packages(c("lmboot"), repos="https://cloud.r-project.org", lib="/srv/conda/envs/notebook/lib/R/library")' From e3f3094cfd86360665b736c46b16b3cd8595abc7 Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 22:56:39 +0000 Subject: [PATCH 15/17] Update postBuild --- .binder/postBuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.binder/postBuild b/.binder/postBuild index b70449a..0ec44a1 100644 --- a/.binder/postBuild +++ b/.binder/postBuild @@ -5,7 +5,7 @@ set -o errexit set -o nounset # Uninstall jupyter-offlinenotebook extension since the 'Download' button function is buggy -# Download from the 'File' menu instead +# Download/upload to/from browser storage then download from the 'File' menu instead # micromamba remove -yn notebook jupyter-offlinenotebook # Installation of Octave packages is dependent on current user. From 90e3750fbf07861f8e2296d79b553b5d2e9a46ca Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 23:13:40 +0000 Subject: [PATCH 16/17] Update environment.yml --- .binder/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.binder/environment.yml b/.binder/environment.yml index 6293261..2a746a8 100644 --- a/.binder/environment.yml +++ b/.binder/environment.yml @@ -36,7 +36,7 @@ dependencies: - r-lmertest == 3.1_3 - r-parameters == 0.21.1 - r-emmeans == 1.8.6 - - r-multcomp + - r-multcomp == 1.4_23 # Jupyter Lab extensions - jupyterlab-spreadsheet-editor == 0.6.1 - jupyterlab-drawio == 0.9.0 From 13ae571fcd0f9d9639168f06e2ea15d955a217ab Mon Sep 17 00:00:00 2001 From: acpennlab <147250307+acpennlab@users.noreply.github.com> Date: Wed, 13 Mar 2024 23:16:23 +0000 Subject: [PATCH 17/17] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index c9e943b..3bb7f35 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ Try the statistics-resampling package online in a Notebook with an **Octave** kernel within Jupyter Lab using Binder by clicking the launch-binder button: +[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/acpennlab/statistics-resampling-online/master?labpath=statistics-resampling.ipynb) (default branch: master) + [![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/acpennlab/statistics-resampling-online/jammy?labpath=statistics-resampling.ipynb) (stable branch: jammy) Note that the first time you access statistics-resampling-online (since the last commit at the GitHub repository) it may take a while to build, but frequent access to statistics-resampling-online thereon should give load times less than a minute. Data files (.tsv and .csv) can be conveniently modified using the [jupyterlab-spreadsheet-editor](https://jupyterlab-contrib.github.io/jupyterlab-spreadsheet-editor.html) included in this environment. Other Jupyter Lab extensions included enable the creation and editing of diagrams and LaTeX documents. The environment also includes kernels to run workbooks in **Julia**, **Python** and **R** (in which additional packages and modules can be installed with Pkg, pip, or from CRAN respectively). Preferably, pre-built packages can also be installed from within code cells of a notebook by executing the system command `!conda install -qc conda-forge `, where `` is replaced with the name of a [conda-forge package](https://conda-forge.org/packages/).