Merge lp://staging/~cjwatson/meliae/tox into lp://staging/meliae

Proposed by Colin Watson
Status: Merged
Approved by: John A Meinel
Approved revision: 201
Merged at revision: 200
Proposed branch: lp://staging/~cjwatson/meliae/tox
Merge into: lp://staging/meliae
Diff against target: 101 lines (+39/-12)
6 files modified
.bzrignore (+3/-0)
Makefile (+2/-2)
pyproject.toml (+7/-0)
setup.cfg (+2/-0)
setup.py (+14/-10)
tox.ini (+11/-0)
To merge this branch: bzr merge lp://staging/~cjwatson/meliae/tox
Reviewer Review Type Date Requested Status
John A Meinel Approve
Review via email: mp+378240@code.staging.launchpad.net

Commit message

Add tox testing support.

Description of the change

This involved some other changes due to various oddities of Python packaging. It was easiest to convert to setuptools, which is ubiquitous nowadays and has had built-in Cython support for some time. Persuading tox to install Cython early enough was a bit fiddly, but I eventually made it work by using PEP 518-style build system requirement specifications.

I have a Python 3 port of meliae, and this is my usual first step in any such port these days: it makes it much easier to quickly run tests over a matrix of versions.

To post a comment you must log in.
Revision history for this message
John A Meinel (jameinel) wrote :

'tox testenv' seems to build and run the test suite.
There does seem to be a few warnings during the build about
meliae/_scanner_core.c:63:1: warning: function declaration isn’t a prototype [-Wstrict-prototypes]

but it does build, and it does pass the test suite.

Would it make sense to update "make check" to use tox internally instead of doing it itself?

Revision history for this message
Colin Watson (cjwatson) wrote :

The prototype warning is fixed by https://code.launchpad.net/~cjwatson/meliae/syntax-cleanups/+merge/378249.

I think it would probably make sense to update "make check", yes. Do you want that in this MP or shall I do it separately?

Revision history for this message
Colin Watson (cjwatson) wrote :

(BTW, just "tox" is sufficient.)

Revision history for this message
John A Meinel (jameinel) wrote :

If it is hard for you to do in this PR, we can do it as a follow up, but it would be nice for 'make check' to stay the correct way to run the test suite.

lp://staging/~cjwatson/meliae/tox updated
201. By Colin Watson

Rewrite "make check" to use tox.

Revision history for this message
Colin Watson (cjwatson) wrote :

OK, done.

Revision history for this message
John A Meinel (jameinel) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: