Skip to content

Commit

Permalink
sagemathgh-35396: Activate/fix rpy2 tests
Browse files Browse the repository at this point in the history
    
<!-- Please provide a concise, informative and self-explanatory title.
-->
<!-- Don't put issue numbers in the title. Put it in the Description
below. -->
<!-- For example, instead of "Fixes sagemath#12345", use "Add a new method to
multiply two integers" -->

### 📚 Description

<!-- Describe your changes here in detail. -->

As a follow-up on:
- sagemath#35237

we make `rpy2` a dynamically detected feature, enabling the automatic
run of doctests tagged `# optional - rpy2`; we use a file-level doctest
tag for the `r.py` file.

We also update the spkg documentation for sagemath#35347

<!-- Why is this change required? What problem does it solve? -->
<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->

Resolves sagemath#35347

<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. It should be `[x]` not `[x
]`. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [ ] I have linked a relevant issue or discussion.
- [ ] I have created tests covering the changes.
- [ ] I have updated the documentation accordingly.

### ⌛ Dependencies

<!-- List all open PRs that this PR logically depends on
- sagemath#12345: short description why this is a dependency
- sagemath#34567: ...
-->
- Depends on sagemath#35237
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#35396
Reported by: Matthias Köppe
Reviewer(s): Kwankyu Lee, Matthias Köppe
  • Loading branch information
Release Manager committed Jun 9, 2024
2 parents 31e2166 + 11833d8 commit 111de63
Show file tree
Hide file tree
Showing 6 changed files with 201 additions and 199 deletions.
11 changes: 11 additions & 0 deletions build/pkgs/r/SPKG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,14 @@ Upstream Contact

- https://www.r-project.org
- R mailing list, #R in IRC


Special Installation Instructions
---------------------------------

In the Sage distribution, ``r`` is a "dummy" package:
It is here to provide information about equivalent system packages.
R cannot be installed using the Sage distribution.
Please install it manually, either using one of the system package
commands shown here or following the upstream instructions
at https://www.r-project.org
1 change: 1 addition & 0 deletions build/pkgs/r/distros/conda.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
r
r-essentials
r-lattice
14 changes: 9 additions & 5 deletions build/pkgs/rpy2/SPKG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,16 @@ License
-------

- GPL 2+
- Note that we have deleted references to Mozilla PL as an option,
which we are allowed to do by the full rpy2 license in order to
remain GPL-compatible


Upstream Contact
----------------

- https://rpy2.bitbucket.io
- https://github.com/rpy2/rpy2

Special Installation Instructions
---------------------------------

In the Sage distribution, ``rpy2`` is a "semi-standard" package: It will be
automatically installed by the Sage distribution if a suitable system
installation of R is detected by ``configure``. (Note that Sage no longer
ships and installs its own copy of R.)
1 change: 1 addition & 0 deletions src/sage/features/standard.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,6 @@ def all_features():
PythonModule('ptyprocess', spkg='ptyprocess', type='standard'),
PythonModule('pyparsing', spkg='pyparsing', type='standard'),
PythonModule('requests', spkg='requests', type='standard'),
PythonModule('rpy2', spkg='rpy2', type='standard'),
PythonModule('scipy', spkg='scipy', type='standard'),
PythonModule('sympy', spkg='sympy', type='standard')]
Loading

0 comments on commit 111de63

Please sign in to comment.