From f842a9d723b5a8547c5e9e8b1d99068cd2141c30 Mon Sep 17 00:00:00 2001 From: Laurent Gautier Date: Sat, 23 Dec 2023 18:11:09 -0500 Subject: [PATCH 1/4] Add Python 3.12 --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 9dd8626..4f84025 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -13,7 +13,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7, 3.8, 3.9, "3.10", "3.11"] + python-version: [3.7, 3.8, 3.9, "3.10", "3.11" ,"3.12"] r-version: ['release'] os: [ubuntu-latest, macOS-latest] include: From e1d64ea20d107083f8fe106bf2d8536996cc083c Mon Sep 17 00:00:00 2001 From: Laurent Gautier Date: Sat, 23 Dec 2023 23:35:20 -0500 Subject: [PATCH 2/4] Update pythonpackage.yml --- .github/workflows/pythonpackage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index 4f84025..5817a87 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -49,7 +49,7 @@ jobs: flake8 rpy2_arrow --count --max-complexity=10 --max-line-length=127 --statistics - name: Install package run: | - python setup.py install + pip install . - name: Test with pytest run: | export LD_LIBRARY_PATH=$(python -m rpy2.situation LD_LIBRARY_PATH):${LD_LIBRARY_PATH} From d5952884de66422ba2f5af0d80060f5e6442d6c1 Mon Sep 17 00:00:00 2001 From: Laurent Gautier Date: Mon, 25 Dec 2023 21:12:12 -0500 Subject: [PATCH 3/4] Drop Python 3.7, add ubuntu 22.04. --- .github/workflows/pythonpackage.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index eaf7358..ec414c9 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -24,9 +24,9 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [3.7, 3.8, 3.9, "3.10", "3.11" ,"3.12"] + python-version: [3.8, 3.9, "3.10", "3.11" ,"3.12"] r-version: ['release'] - os: [ubuntu-latest, macOS-latest] + os: [ubuntu-22.04, ubuntu-latest, macOS-latest] include: - os: ubuntu-latest SYSTEM_DEPS: sudo apt-get install -y libcurl4-gnutls-dev From e9a8f2eae07e91c5c6caad9a70bfcd1c5356f327 Mon Sep 17 00:00:00 2001 From: Laurent Gautier Date: Mon, 25 Dec 2023 21:26:33 -0500 Subject: [PATCH 4/4] Try to get the static Arrow library. (see https://arrow.apache.org/docs/r/articles/install.html#r-source-package-with-libarrow-binary). --- .github/workflows/pythonpackage.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index ec414c9..95e38b2 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -28,6 +28,8 @@ jobs: r-version: ['release'] os: [ubuntu-22.04, ubuntu-latest, macOS-latest] include: + - os: ubuntu-22.04 + SYSTEM_DEPS: sudo apt-get install -y libcurl4-gnutls-dev - os: ubuntu-latest SYSTEM_DEPS: sudo apt-get install -y libcurl4-gnutls-dev - os: macOS-latest @@ -47,6 +49,7 @@ jobs: - name: Install R dependencies run: | install.packages(c("assertthat", "cpp11", "tidyselect", "vctrs", "R6", "purrr", "bit64")) + Sys.setenv("NOT_CRAN" = "true") install.packages("arrow") shell: Rscript {0} - name: Install dependencies