Rewrite Debian/Ubuntu packaging #24
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
To avoid having to deal with the setup.py install vagueries when installing python for Debian packaging, let pybuild take care of the building and installing of python. Rewrite debian/rules to make use of debhelper for as much as possible and minimize hackery. Also remove Debian-packaging-specific hacks in Makefile.in The recipe we are now following is to install everything in debian/tmp (instead of straight into the debian/<package>/ directories), and divide the resulting files up over the packages using debian/<package.install> files. Try to clean up some Lintin errors and warnings in the process. Note that we are still using distutils in the setup.py files and calling "python setup.py install" which are both deprecated. Only this combination appears to not be hit by pypa/pip#10978 so just leaving as is. Also introduces: * testing on both Focal and Jammy * fix intermittent test failure in build process
cianwilson
approved these changes
Nov 1, 2022
There was a problem hiding this comment.
Looks great. This is a huge improvement and will help me immensely on a few machines where I've run into problems with this already. Thanks @stephankramer !
Couple of quick questions in the comments but happy to approve regardless.
.github/workflows/ubuntu.yml
Outdated
| @@ -22,7 +38,7 @@ jobs: | |||
| run: | | |||
| echo "Europe/London" > /etc/timezone | |||
| apt-get -y update | |||
| DEBIAN_FRONTEND=noninteractive apt-get -y install gfortran g++ python3-setuptools python3-all-dev debhelper dh-python texlive python3-junit.xml | |||
| DEBIAN_FRONTEND=noninteractive apt-get -y install gfortran g++ python3-setuptools python3-pip python3-all-dev debhelper dh-python texlive python3-junit.xml | |||
There was a problem hiding this comment.
Not a problem but curious if the pip installation is still necessary or leftover from when you were trying it that way?
debian/control
Outdated
| Priority: extra | ||
| Build-Depends: gfortran (>=4.2), g++ (>=4.2), python3-setuptools (>= 0.6b3-1), python3-all-dev (>= 2.3.5-11), debhelper (>= 5.0.38), dh-python, texlive | ||
| Priority: optional | ||
| Build-Depends: gfortran (>=4.2), g++ (>=4.2), python3-setuptools (>= 39), python3-pip, python3-all-dev , debhelper (>= 5.0.38), dh-python, texlive |
There was a problem hiding this comment.
Same question about pip, is it a required dependency?
There was a problem hiding this comment.
No indeed. Removed
Also update actions versions to get rid of github actions warnings
stephankramer
force-pushed
the
fix-package-building
branch
7 times, most recently
from
368b636 to
7877ed7
Compare
stephankramer
force-pushed
the
fix-package-building
branch
from
7877ed7 to
b30d9ae
Compare
|
Thanks, good point. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To avoid having to deal with the setup.py install vagueries when installing python for Debian packaging, let pybuild take care of the building and installing of python. Rewrite debian/rules to make use of debhelper for as much as possible and minimize hackery. Also remove Debian-packaging-specific hacks in Makefile.in
The recipe we are now following is to install everything in debian/tmp (instead of straight into the debian// directories), and divide the resulting files up over the packages using debian/<package.install> files. Try to clean up some Lintin errors and warnings in the process.
Note that we are still using distutils in the setup.py files and calling "python setup.py install" which are both deprecated. Only this combination appears to not be hit by pypa/pip#10978 so just leaving as is.
Also introduces: