Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix make SPKG-uninstall for Python packages after #36452 #36737

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Fix make SPKG-uninstall for Python packages after #36452 #36737

merged 1 commit into from
Nov 30, 2023

Conversation

mkoeppe
Copy link
Contributor

@mkoeppe mkoeppe commented Nov 19, 2023

#36452 broke make SPKG-uninstall for Python packages.

Reproducer:

$ make zipp-uninstall
...
if [ -d '/Users/mkoeppe/s/sage/sage-rebasing/worktree-clean/local/var/lib/sage/venv-python3.10' ]; then sage-spkg-uninstall  zipp '/Users/mkoeppe/s/sage/sage-rebasing/worktree-clean/local/var/lib/sage/venv-python3.10'; fi
Uninstalling existing 'zipp'
Running pip-uninstall script for 'zipp'
ERROR: Could not open requirements file: [Errno 2] No such file or directory: '/Users/mkoeppe/s/sage/sage-rebasing/worktree-clean/local/var/lib/sage/venv-python3.10/var/lib/sage/scripts/zipp/spkg-requirements.txt'
Warning: pip exited with status 0
Removing stamp file '/Users/mkoeppe/s/sage/sage-rebasing/worktree-clean/local/var/lib/sage/venv-python3.10/var/lib/sage/installed/zipp-3.11.0'
$ ./sage -pip list | grep zipp 
zipp                           3.11.0

📝 Checklist

  • The title is concise, informative, and self-explanatory.
  • 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

@mkoeppe mkoeppe added this to the sage-10.2 milestone Nov 19, 2023
@mkoeppe mkoeppe self-assigned this Nov 19, 2023
@github-actions GitHub Actions
Copy link

Documentation preview for this PR (built with commit c5b6f9d; changes) is ready! 🎉

kwankyu
kwankyu approved these changes Nov 20, 2023
View reviewed changes
Copy link
Collaborator

@kwankyu kwankyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK.

@mkoeppe
Copy link
Contributor Author

mkoeppe commented Nov 20, 2023

Thank you!

vbraun pushed a commit to vbraun/sage that referenced this pull request Nov 27, 2023
sagemathgh-36737: Fix make SPKG-uninstall for Python packages after s…
e129e38 
…agemath#36452

    
<!-- ^^^^^
Please provide a concise, informative and self-explanatory title.
Don't put issue numbers in there, do this in the PR body below.
For example, instead of "Fixes sagemath#1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->

<!-- Why is this change required? What problem does it solve? -->
sagemath#36452 broke `make SPKG-uninstall` for Python packages.

Reproducer:
```
$ make zipp-uninstall
...
if [ -d '/Users/mkoeppe/s/sage/sage-rebasing/worktree-
clean/local/var/lib/sage/venv-python3.10' ]; then sage-spkg-uninstall
zipp '/Users/mkoeppe/s/sage/sage-rebasing/worktree-
clean/local/var/lib/sage/venv-python3.10'; fi
Uninstalling existing 'zipp'
Running pip-uninstall script for 'zipp'
ERROR: Could not open requirements file: [Errno 2] No such file or
directory: '/Users/mkoeppe/s/sage/sage-rebasing/worktree-
clean/local/var/lib/sage/venv-python3.10/var/lib/sage/scripts/zipp/spkg-
requirements.txt'
Warning: pip exited with status 0
Removing stamp file '/Users/mkoeppe/s/sage/sage-rebasing/worktree-
clean/local/var/lib/sage/venv-
python3.10/var/lib/sage/installed/zipp-3.11.0'
$ ./sage -pip list | grep zipp
zipp                           3.11.0
```



<!-- If this PR resolves an open issue, please link to it here. For
example "Fixes sagemath#12345". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->
<!-- If your change requires a documentation PR, please link it
appropriately -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
<!-- Feel free to remove irrelevant items. -->

- [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: ...
-->

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36737
Reported by: Matthias Köppe
Reviewer(s): Kwankyu Lee
@vbraun vbraun merged commit 2994fa6 into sagemath:develop Nov 30, 2023
16 of 21 checks passed
vbraun pushed a commit to vbraun/sage that referenced this pull request Dec 13, 2023
sagemathgh-36747: build/bin/sage-spkg: Add support for installing s…
6cadd84 
…cript packages

    
<!-- ^^^^^
Please provide a concise, informative and self-explanatory title.
Don't put issue numbers in there, do this in the PR body below.
For example, instead of "Fixes sagemath#1234" use "Introduce new method to
calculate 1+1"
-->
<!-- Describe your changes here in detail -->
Split out and updated from sagemath#29386.

The section of `build/make/Makefile.in` that deals with script packages
can be consolidated with the section on normal packages later, in a
follow-up PR after sagemath#36740, sagemath#36738.

We switch the `spkg-install` scripts of the `sage*` script packages to
the templated versions (`spkg-install.in`), which is a simplification.
`spkg-check` remains as is because we still invoke it directly (changing
this will need sagemath#36738).

Resolves sagemath#29386.

<!-- 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". -->
<!-- If your change requires a documentation PR, please link it
appropriately. -->

### 📝 Checklist

<!-- Put an `x` in all the boxes that apply. -->
<!-- If your change requires a documentation PR, please link it
appropriately -->
<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
<!-- Feel free to remove irrelevant items. -->

- [x] The title is concise, informative, and self-explanatory.
- [x] The description explains in detail what this PR is about.
- [x] 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#36737 (for testing)

<!-- If you're unsure about any of these, don't hesitate to ask. We're
here to help! -->
    
URL: sagemath#36747
Reported by: Matthias Köppe
Reviewer(s): Michael Orlitzky
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kwankyu kwankyu kwankyu approved these changes

@vbraun vbraun Awaiting requested review from vbraun

@jhpalmieri jhpalmieri Awaiting requested review from jhpalmieri

Assignees

@mkoeppe mkoeppe

Labels
p: blocker / 1
Projects
None yet
Milestone
sage-10.2
Development

Successfully merging this pull request may close these issues.
3 participants
@mkoeppe @kwankyu @vbraun