Merge branch 'master' of github.com:rpy2/rpy2

rpy2 · Feb 24, 2023 · 54ad3b4 · 54ad3b4
2 parents e68e583 + 2a820b6
commit 54ad3b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -23,6 +23,9 @@ Bugs fixed
    mismatch error with some build/install toolchain (issue #984). The import is now
    lazy/delayed.
 
+- Installation targets `pandas`, `all`, and `test` now specify `pandas>=1.2.0`
+  (which should limit frequencies of issues like #998).
+
 Changes
 -------
 

diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ For example, to be able to run the unit tests:
 pip install rpy2[test]
 ```
 
-To install all dependencies, use:
+To install all optional dependencies (numpy, pandas, ipython), use:
 
 ```bash
 pip install rpy2[all]

diff --git a/pyproject.toml b/pyproject.toml
@@ -36,11 +36,11 @@ dependencies = [
 dynamic = ["version"]
 
 [project.optional-dependencies]
-test = ["pytest", "ipython", "numpy", "pandas"]
-numpy = ["pandas"]
-pandas = ["numpy", "pandas"]
+test = ["pytest", "ipython", "numpy", "pandas>=1.2.0"]
+numpy = []
+pandas = ["numpy", "pandas>=1.2.0"]
 types = ["mypy", "types-pytz", "types-tzlocal"]
-all = ["pytest", "ipython", "pandas", "numpy"]
+all = ["pytest", "ipython", "pandas>=1.2.0", "numpy"]
 
 [project.urls]
 Homepage = "https://rpy2.github.io"