Pedro пре 1 дан
родитељ
комит
9c941771e4
3 измењених фајлова са 10 додато и 3 уклоњено
  1. 8 1
      2022/r_install_elic.R
  2. 1 1
      2025/install_elic_python_ext.py
  3. 1 1
      utils/r_install.R

+ 8 - 1
2022/r_install_elic.R

@@ -11,7 +11,7 @@ install_archived <- function(pkg, version) {
   install.packages(url, repos = NULL, type = "source", lib=EBROOTELIC_R)
 }
 
-packages = c('leaflet', 'satellite', 'intervals', 'spacetime', 'gstat', 'automap', 'reporttools', 'rgeos', 'rworldmap', 'colorRamps', 'mapdata', 'mapproj', 'RPostgreSQL', 'getPass', 'stringdist', 'here', 'svMisc', 'networkD3', 'wordcloud', 'ngram', 'xgboost', 'rts', 'RgoogleMaps', 'packrat', 'rsconnect', 'rpostgis', 'aws.signature', 'aws.s3', 'geosphere', 'fuzzyjoin', 'refinr', 'x13binary', 'seasonal', 'mitools', 'survey', 'sysfonts', 'showtextdb', 'showtext', 'BiocManager', 'rvcheck', 'scatterpie', 'rlist', 'measurements', 'qpdf', 'fda', 'fda.usc', 'gstat', 'countrycode', 'itcSegment', 'rwunderground', 'corrplot', 'prettymapr', 'prospectr', 'rpart.plot', 'varhandle', 'expint', 'actuar', 'psych', 'plotly', 'spatstat', 'raster', 'treemap', 'ggmap', 'hts', 'thief', 'forecastHybrid', 'colourpicker', 'profvis', 'jsonlite', 'readxl', 'tidyverse', 'data.table', 'lubridate', 'stringi', 'snakecase', 'Matrix', 'RSelenium', 'devtools', 'ggplot2', 'metR', 'raster', 'rgeos' , 'sp' , 'rgdal' , 'rmapshaper' ,'adehabitatMA', 'maptools', 'plyr' , 'dplyr' , 'tmap', 'tmaptools', 'reshape', 'ggplot2', 'png', 'SPEI', 'rnaturalearth', 'ggspatial', 'modifiedmk', 'rstac', 'languageserver')
+packages = c('leaflet', 'satellite', 'intervals', 'spacetime', 'gstat', 'automap', 'reporttools', 'rgeos', 'rworldmap', 'colorRamps', 'mapdata', 'mapproj', 'RPostgreSQL', 'getPass', 'stringdist', 'here', 'svMisc', 'networkD3', 'wordcloud', 'ngram', 'xgboost', 'rts', 'RgoogleMaps', 'packrat', 'rsconnect', 'rpostgis', 'aws.signature', 'aws.s3', 'geosphere', 'fuzzyjoin', 'refinr', 'x13binary', 'seasonal', 'mitools', 'survey', 'sysfonts', 'showtextdb', 'showtext', 'BiocManager', 'rvcheck', 'scatterpie', 'rlist', 'measurements', 'qpdf', 'fda', 'fda.usc', 'gstat', 'countrycode', 'itcSegment', 'rwunderground', 'corrplot', 'prettymapr', 'prospectr', 'rpart.plot', 'varhandle', 'expint', 'actuar', 'psych', 'plotly', 'spatstat', 'raster', 'treemap', 'ggmap', 'hts', 'thief', 'forecastHybrid', 'colourpicker', 'profvis', 'jsonlite', 'readxl', 'tidyverse', 'data.table', 'lubridate', 'stringi', 'snakecase', 'Matrix', 'RSelenium', 'devtools', 'ggplot2', 'metR', 'raster', 'rgeos' , 'sp' , 'rgdal' , 'rmapshaper' ,'adehabitatMA', 'maptools', 'plyr' , 'dplyr' , 'tmap', 'tmaptools', 'reshape', 'ggplot2', 'png', 'SPEI', 'rnaturalearth', 'ggspatial', 'modifiedmk', 'rstac', 'languageserver', 'rnaturalearthdata')
 
 ## Now load or install&load all
 package.check <- lapply(
@@ -36,3 +36,10 @@ install_archived("rgeoboundaries", "0.0.0.9000")
 install_archived("waffle", "1.0.1")
 install_archived("httpgd", "1.3.1")
 
+# 3. Custom
+remotes::install_github("ropensci/rnaturalearthhires")
+install.packages(
+  "rnaturalearthhires",
+  repos = "https://ropensci.r-universe.dev",
+  type = "source"
+)

+ 1 - 1
2025/install_elic_python_ext.py

@@ -2,7 +2,7 @@
 
 #pip install Flask --user --dry-run --upgrade-strategy only-if-needed
 
-pip install Flask Werkzeug absl-py acccmip6 access affine altair antlr4-python3-runtime args asciitree astunparse attrdict aws-requests-auth blinker boto3==1.39.8 brotli cachetools cdo cdsapi cf-units clang clint configobj coverage dash dash-core-components dash-html-components ecmwf-datastores-client itsdangerous multiurl retrying s3transfer tqdm Flask-Compress backports.zstd dash-table deepmerge descartes dill entrypoints eofs esda et_xmlfile fasteners flatbuffers giddy libpysal quantecon seaborn sympy ImageIO google-auth google-auth-oauthlib google-pasta grpcio gsw inequality ipympl jsonlines pyasn1_modules requests-oauthlib rsa keras keras-nightly Keras-Preprocessing mamba Markdown MetPy mgwr momepy nose olefile opencv-contrib-python==4.11.0.86 opencv-python==4.11.0.86 openpyxl opt-einsum pointpats Polygon3 protobuf PuLP pyasn1-modules PyWavelets click jsonlines lazy_loader mapclassify pyresample pysal quilt3 radian rasterio rasterstats rchitect requests-futures rtree rvlib scikit-image segregation spaghetti spint splot spopt tifffile tobler seawater snuggs spvcm tensorboard tensorboard-data-server tensorboard-plugin-wit tensorflow tensorflow-estimator termcolor testpath salem PyQt5 colormaps --user --upgrade-strategy only-if-needed
+pip install Flask Werkzeug absl-py acccmip6 access affine altair antlr4-python3-runtime args asciitree astunparse attrdict aws-requests-auth blinker boto3==1.39.8 brotli cachetools cdo cdsapi cf-units clang clint configobj coverage dash dash-core-components dash-html-components ecmwf-datastores-client itsdangerous multiurl retrying s3transfer tqdm Flask-Compress backports.zstd dash-table deepmerge descartes dill entrypoints eofs esda et_xmlfile fasteners flatbuffers giddy libpysal quantecon seaborn sympy ImageIO google-auth google-auth-oauthlib google-pasta grpcio gsw inequality ipympl jsonlines pyasn1_modules requests-oauthlib rsa keras keras-nightly Keras-Preprocessing mamba Markdown MetPy mgwr momepy nose olefile opencv-contrib-python==4.11.0.86 opencv-python==4.11.0.86 openpyxl opt-einsum pointpats Polygon3 protobuf PuLP pyasn1-modules PyWavelets click jsonlines lazy_loader mapclassify pyresample pysal quilt3 radian rasterio rasterstats rchitect requests-futures rtree rvlib scikit-image segregation spaghetti spint splot spopt tifffile tobler seawater snuggs spvcm tensorboard tensorboard-data-server tensorboard-plugin-wit tensorflow tensorflow-estimator termcolor testpath salem PyQt5 colormaps xgcm neutralocean --user --upgrade-strategy only-if-needed
 
 #pygeos pywct
 

+ 1 - 1
utils/r_install.R

@@ -10,7 +10,7 @@ package.check <- lapply(
   packages,
   FUN = function(x) {
     if (!require(x, character.only = TRUE)) {
-      install.packages(x, repos='https://www.freestatistics.org/cran/', lib='/opt/easybuild/soft/2021b/software/ELIC_R/1-foss-2021b')
+      install.packages(x, repos='https://www.freestatistics.org/cran/', lib='/opt/easybuild/soft/2024a/software/R-bundle-CRAN/2024.11-foss-2024a')
       library(x, character.only = TRUE)
     }
   }