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.

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

Add package for python3-aeneas #245

Conversation

StephenMcConnel
Copy link
Contributor

Also fix spurious warning messages that occur for at least python 3.8.

This is needed for the soon arrival of Ubuntu 20.04 which ships with python3 by default.

debian/changelog Outdated
@@ -1,3 +1,10 @@
aeneas (1.7.4) stable; urgency=medium
Copy link
Contributor

Choose a reason for hiding this comment

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

It should be 1.7.3 since 1.7.4 is in devel branch and hasn't been released.

debian/control Outdated
Homepage: https://github.com/readbeyond/aeneas

Package: python-aeneas
Architecture: any
Depends: ${misc:Depends}, ${python:Depends},
espeak, espeak-data, libespeak1, vorbis-tools, ffmpeg, flac
Conflicts: python3-aeneas
Copy link
Contributor

Choose a reason for hiding this comment

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

Why should they be conflicting? You could have them installed under python2 and python3?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I could be wrong in the details, but I think the shell script in /usr/bin retains the same name regardless of the version of python it calls, but it calls a specific version of python. My effort was to make the minimal change necessary to get python3-aeneas packages working.
I'm not sure why anyone would need both packages installed simultaneously.
Some of what is going on in python package builds is still magic to me, and I was relieved that it worked as well and as easily as it did even if the resulting packages had a conflict in one or two files.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed Conflicts: to Replaces: for both binary packages

@@ -1,5 +1,9 @@
Changelog
=========
v1.7.4 (2020-04-02)
Copy link
Contributor

Choose a reason for hiding this comment

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

This wouldn't be a release of 1.7.4

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are a couple of trivial code changes from what I started with, so we can't really call it 1.7.3
(which already existed in the changelog, if not in debian packages). I didn't see that 1.7.4 was taken on a branch somewhere. If it works, I suppose we could change the version to 1.7.3.1.

Copy link
Contributor

Choose a reason for hiding this comment

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

1.7.3.1 make sense to me.

@StephenMcConnel StephenMcConnel force-pushed the CreatePython3DebianPackage-20200402 branch from 5c09dd2 to c1b9e1e Compare May 6, 2020 18:37
@chrisvire
Copy link
Contributor

@pettarin, could you accept this PR? We need this change for support Ubuntu Focal 20.04 which doesn't have Python2.

@pettarin
Copy link

pettarin commented May 8, 2020 via email

debian/control Outdated

Package: python3-aeneas
Architecture: any
Depends: ${misc:Depends}, ${python3:Depends},
Copy link
Contributor

Choose a reason for hiding this comment

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

Needs ${shlibs:Depends} to work around lintian error: missing-dependency-on-libc

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added.

Copy link
Contributor

@chrisvire chrisvire left a comment

Choose a reason for hiding this comment

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

Since the rules is creating two packages, the install script needs to be changes:

  1. copy debian/install to debian/python3-aeneas.install
  2. rename debian/install to debian/python-aeneas.install
  3. in debian/python3-aeneas.install, change all python-aeneas to python3-aeneas.

This way the /usr/share/python-aeneas and /usr/share/phython3-aeneas` folders are installed correctly for the python-aeneas and python3-aeneas packages respectively.

debian/control Outdated
libasound2-dev, libsndfile1-dev, libespeak-dev
Standards-Version: 3.9.5
Standards-Version: 4.1.4
Homepage: https://github.com/readbeyond/aeneas

Package: python-aeneas
Architecture: any
Depends: ${misc:Depends}, ${python:Depends},
Copy link
Contributor

Choose a reason for hiding this comment

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

Needs ${shlibs:Depends} to work around lintian error: missing-dependency-on-libc

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done.

@@ -3,5 +3,5 @@
export PYBUILD_NAME=aeneas

%:
dh $@ --with python2 --buildsystem=pybuild
dh $@ --with python2,python3 --buildsystem=pybuild

Copy link
Contributor

Choose a reason for hiding this comment

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

Need one of these to resolve lintian error: missing-dependency-on-numpy-abi

override_dh_shlibdeps:
        dh_shlibdeps && dh_numpy && dh_numpy3

or

override_dh_python2:
	dh_python2
	dh_numpy

override_dh_python3:
	dh_python3
	dh_numpy3

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added.

@StephenMcConnel StephenMcConnel force-pushed the CreatePython3DebianPackage-20200402 branch from c1b9e1e to 9a4c6ce Compare May 8, 2020 21:51
Copy link
Contributor

@chrisvire chrisvire left a comment

Choose a reason for hiding this comment

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

Sorry, one more change. I had changed it locally and forgot to document it.

* Add debian packaging for python3-aeneas

-- Stephen McConnel <[email protected]> Thu, 02 Apr 2020 16:45:00 -0600

Copy link
Contributor

@chrisvire chrisvire May 8, 2020

Choose a reason for hiding this comment

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

@StephenMcConnel, Drat, I changed this while testing and forgot to include here:

E: python3-aeneas: debian-changelog-file-contains-invalid-email-address alberto@nievo

So

  1. alberto@nievo should be changed to [email protected] or
  2. add debian-changelog-file-contains-invalid-email-address to lintian-overrides files.

I got that address from https://www.albertopettarin.it/contact.html

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I added the line to the lintian-overrides files.

@pettarin
Copy link

pettarin commented May 9, 2020

@chrisvire @StephenMcConnel Hi, thanks a lot for taking care of the necessary changes. I will going to merge this PR as soon as you confirm it is ready on your side. [email protected] is good indeed.

Note that tomorrow (Sunday 2020-05-10) I will also update a bit the documentation, and include new languages, since eSpeak-ng now supports a lot more: https://github.com/espeak-ng/espeak-ng/blob/master/docs/languages.md

If I manage, I will try to release on PyPI by the end of next week --- say, Sunday 2020-05-17.

@pettarin
Copy link

pettarin commented May 9, 2020

@chrisvire @StephenMcConnel also, might I ask you to open the PR against the devel branch, i.o. directly master, please?

@chrisvire
Copy link
Contributor

@pettarin: we can open another PR agains devel as well. We will likely want to have a published package using 1.7.3 and then have some time to test against 1.7.4.

Thanks,
Chris

Also fix spurious warning messages that occur for at least python 3.8.
@StephenMcConnel StephenMcConnel force-pushed the CreatePython3DebianPackage-20200402 branch from 9a4c6ce to 5da2217 Compare May 11, 2020 17:23
@chrisvire
Copy link
Contributor

@pettarin: This looks all good to me. Can you merge it?

@readbeyond readbeyond merged commit 4d200a0 into readbeyond:master May 13, 2020
@readbeyond
Copy link
Owner

@chrisvire @StephenMcConnel Merged, thank you! I will credit you in the documentation, as of 1.7.4. (I planned to work towards 1.7.4 last Sunday, but I had to deal with an emergency and my plans went south. I hope the upcoming weekend will be easier on me.) I understand that you do not need a PyPI release, for the deb package the merge on master was sufficient, isn't it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants