Rerender for Matrix ABI change (#29)

automerged PR by conda-forge/automerge-action
conda-forge · Mar 22, 2024 · 1c77eff · 1c77eff
2 parents 0bdc907 + 4b6e3cc
commit 1c77eff
Show file tree

Hide file tree

Showing 12 changed files with 114 additions and 66 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/README.md b/README.md
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
diff --git a/build-locally.py b/build-locally.py
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -14,60 +14,68 @@ source:
 
 build:
   merge_build_host: true  # [win]
-  number: 0
+  number: 1
   rpaths:
     - lib/R/lib/
     - lib/
 
 requirements:
   build:
-    - cross-r-base {{ r_base }}  # [build_platform != target_platform]
-    - r-minqa                    # [build_platform != target_platform]
-    - r-boot                     # [build_platform != target_platform]
-    - r-statmod                  # [build_platform != target_platform]
-    - r-nlme                     # [build_platform != target_platform]
-    - r-rcppeigen                # [build_platform != target_platform]
-    - r-lattice                  # [build_platform != target_platform]
-    - r-rcpp                     # [build_platform != target_platform]
-    - r-nloptr                   # [build_platform != target_platform]
-    - r-mass                     # [build_platform != target_platform]
-    - {{ compiler('c') }}        # [not win]
-    - {{ compiler('cxx') }}      # [not win]
-    - {{ compiler('m2w64_c') }}        # [win]
-    - {{ compiler('m2w64_cxx') }}        # [win]
+    - cross-r-base {{ r_base }}    # [build_platform != target_platform]
+    - r-boot                       # [build_platform != target_platform]
+    - r-lattice                    # [build_platform != target_platform]
+    - r-mass                       # [build_platform != target_platform]
+    - r-matrix >=1.6_2             # [build_platform != target_platform]
+    - r-minqa >=1.1.15             # [build_platform != target_platform]
+    - r-nlme >=3.1_123             # [build_platform != target_platform]
+    - r-nloptr >=1.0.4             # [build_platform != target_platform]
+    - r-rcpp >=0.10.5              # [build_platform != target_platform]
+    - r-rcppeigen >=0.3.3.9.4      # [build_platform != target_platform]
+    - {{ compiler('c') }}          # [not win]
+    - {{ compiler('cxx') }}        # [not win]
+    - {{ compiler('m2w64_c') }}    # [win]
+    - {{ compiler('m2w64_cxx') }}  # [win]
     - {{ posix }}filesystem        # [win]
     - {{ posix }}make
     - {{ posix }}sed               # [win]
     - {{ posix }}coreutils         # [win]
     - {{ posix }}zip               # [win]
   host:
     - r-base
-    - r-mass
-    - r-statmod
-    - r-rcpp >=0.10.5
-    - r-rcppeigen
     - r-boot
     - r-lattice
+    - r-mass
+    ## technically could be min r-matrix is 1.2_1
+    ## but <1.6_2 is ABI incompatible with >=1.6_2
+    - r-matrix >=1.6_2
     - r-minqa >=1.1.15
     - r-nlme >=3.1_123
     - r-nloptr >=1.0.4
+    - r-rcpp >=0.10.5
+    - r-rcppeigen >=0.3.3.9.4
   run:
     - r-base
     - {{ native }}gcc-libs         # [win]
-    - r-mass
-    - r-statmod
-    - r-rcpp >=0.10.5
-    - r-rcppeigen
     - r-boot
     - r-lattice
+    - r-mass
+    - r-matrix >=1.6_2
     - r-minqa >=1.1.15
     - r-nlme >=3.1_123
     - r-nloptr >=1.0.4
+    - r-rcpp >=0.10.5
+    - r-rcppeigen >=0.3.3.9.4
 
 test:
+  requires:
+    - r-testthat
+  source_files:
+    - tests/
   commands:
-    - $R -e "library('lme4')"           # [not win]
-    - "\"%R%\" -e \"library('lme4')\""  # [win]
+    - $R -e "library('lme4')"                                                                           # [not win]
+    - $R -e "testthat::test_dir('tests/testthat/', package='lme4', load_package='installed')"           # [not win]
+    - "\"%R%\" -e \"library('lme4')\""                                                                  # [win]
+    - "\"%R%\" -e \"testthat::test_dir('tests/testthat/', package='lme4', load_package='installed')\""  # [win]
 
 about:
   home: https://github.com/lme4/lme4/
@@ -76,30 +84,8 @@ about:
   license_family: GPL3
   license_file:
     - {{ environ["PREFIX"] }}/lib/R/share/licenses/GPL-2
+    - {{ environ["PREFIX"] }}/lib/R/share/licenses/GPL-3
 
 extra:
   recipe-maintainers:
     - conda-forge/r
-
-# Package: lme4
-# Version: 1.1-21
-# Title: Linear Mixed-Effects Models using 'Eigen' and S4
-# Authors@R: c( person("Douglas","Bates", role="aut", comment=c(ORCID="0000-0001-8316-9503")), person("Martin","Maechler", role="aut", comment=c(ORCID="0000-0002-8685-9910")), person("Ben","Bolker",email="[email protected]", role=c("aut","cre"), comment=c(ORCID="0000-0002-2127-0443")), person("Steven","Walker",role="aut", comment=c(ORCID="0000-0002-4394-9078")), person("Rune Haubo Bojesen","Christensen", role="ctb", comment=c(ORCID="0000-0002-4494-3399")), person("Henrik","Singmann", role="ctb", comment=c(ORCID="0000-0002-4842-3657")), person("Bin", "Dai", role="ctb"), person("Fabian", "Scheipl", role="ctb", comment=c(ORCID="0000-0001-8172-3603")), person("Gabor", "Grothendieck", role="ctb"), person("Peter", "Green", role="ctb", comment=c(ORCID="0000-0002-0238-9852")), person("John", "Fox", role="ctb") )
-# Contact: LME4 Authors <[email protected]>
-# Description: Fit linear and generalized linear mixed-effects models. The models and their components are represented using S4 classes and methods.  The core computational algorithms are implemented using the 'Eigen' C++ library for numerical linear algebra and 'RcppEigen' "glue".
-# Depends: R (>= 3.2.0), Matrix (>= 1.2-1), methods, stats
-# LinkingTo: Rcpp (>= 0.10.5), RcppEigen
-# Imports: graphics, grid, splines, utils, parallel, MASS, lattice, boot, nlme (>= 3.1-123), minqa (>= 1.1.15), nloptr (>= 1.0.4)
-# Suggests: knitr, rmarkdown, PKPDmodels, MEMSS, testthat (>= 0.8.1), ggplot2, mlmRev, optimx (>= 2013.8.6), gamm4, pbkrtest, HSAUR2, numDeriv, car, dfoptim
-# VignetteBuilder: knitr
-# LazyData: yes
-# License: GPL (>= 2)
-# URL: https://github.com/lme4/lme4/
-# BugReports: https://github.com/lme4/lme4/issues
-# Encoding: UTF-8
-# NeedsCompilation: yes
-# Packaged: 2019-03-05 17:34:33 UTC; bolker
-# Author: Douglas Bates [aut] (<https://orcid.org/0000-0001-8316-9503>), Martin Maechler [aut] (<https://orcid.org/0000-0002-8685-9910>), Ben Bolker [aut, cre] (<https://orcid.org/0000-0002-2127-0443>), Steven Walker [aut] (<https://orcid.org/0000-0002-4394-9078>), Rune Haubo Bojesen Christensen [ctb] (<https://orcid.org/0000-0002-4494-3399>), Henrik Singmann [ctb] (<https://orcid.org/0000-0002-4842-3657>), Bin Dai [ctb], Fabian Scheipl [ctb] (<https://orcid.org/0000-0001-8172-3603>), Gabor Grothendieck [ctb], Peter Green [ctb] (<https://orcid.org/0000-0002-0238-9852>), John Fox [ctb]
-# Maintainer: Ben Bolker <[email protected]>
-# Repository: CRAN
-# Date/Publication: 2019-03-05 22:40:10 UTC