align with R version 0.6.1

Techtonique · Jan 25, 2024 · f5ec9ef · f5ec9ef
1 parent ce8b49d
commit f5ec9ef
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/BCN/BCNClassifier.py b/BCN/BCNClassifier.py
@@ -44,7 +44,11 @@
                 subprocess.run(['mkdir', '-p', 'bcn_r'])
                 utils.install_packages(StrVector(packages_to_install), lib_loc = StrVector(['bcn_r']))
             except Exception as e2:
-                pass
+                subprocess.run(["mkdir", "-p", "bcn_r"], check=True)
+                command1 = "Rscript -e \"try(utils::install.packages(c('Rcpp', 'dfoptim'), lib='bcn_r', repos='https://cran.rstudio.com', dependencies = TRUE), silent=TRUE)\""
+                subprocess.run(command1, shell=True, check=True)
+                command2 = "Rscript -e \"try(utils::install.packages('bcn', lib='bcn_r', repos='https://techtonique.r-universe.dev', dependencies = TRUE), silent=TRUE)\""
+                subprocess.run(command2, shell=True, check=True)
 
         check_packages = True
 

diff --git a/BCN/BCNRegressor.py b/BCN/BCNRegressor.py
@@ -44,7 +44,11 @@
                 subprocess.run(['mkdir', '-p', 'bcn_r'])
                 utils.install_packages(StrVector(packages_to_install), lib_loc = StrVector(['bcn_r']))                
             except Exception as e2:
-               pass 
+                subprocess.run(["mkdir", "-p", "bcn_r"], check=True)
+                command1 = "Rscript -e \"try(utils::install.packages(c('Rcpp', 'dfoptim'), lib='bcn_r', repos='https://cran.rstudio.com', dependencies = TRUE), silent=TRUE)\""
+                subprocess.run(command1, shell=True, check=True)
+                command2 = "Rscript -e \"try(utils::install.packages('bcn', lib='bcn_r', repos='https://techtonique.r-universe.dev', dependencies = TRUE), silent=TRUE)\""
+                subprocess.run(command2, shell=True, check=True)
 
         check_packages = True
 

diff --git a/HISTORY.rst b/HISTORY.rst
@@ -2,10 +2,11 @@
 History
 =======
 
-0.6.0 (2024-01-24)
+0.6.1 (2024-01-25)
 ------------------
 
 * Add `n_clusters` parameter to `fit` method, to allow for a different number of clusters (for now, only k-means)
+* Avoid division by zero when scaling the data
 
 0.5.3 (2023-08-10)
 ------------------

diff --git a/setup.py b/setup.py
@@ -132,6 +132,6 @@ def install_r():
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/Techtonique/bcn_python',
-    version='0.6.0',
+    version='0.6.1',
     zip_safe=False,
 )