Include tests for conda packaging, fix bug in __array_ufunc__
Links to LiberTEM issue https://github.com/LiberTEM/LiberTEM/issues/1271
Includes tests in the source tarball so that conda build can run them.
Also fixes a potential bug in array_ufunc:
Specifically when the out= kwarg to the ufunc was (None,) numpy was raising a TypeError. I've added a line which converts the single-entry (None,) to just None and now no problems (with the tests). [Mixed/mutil-array out= or single-array out will still remain as they are.]
Merge request reports
Activity
It's weird that ac987861 was needed - as for a previous MR (!38) it did indeed run (although the run itself failed, which is another story :P)
It's possible that the pipeline configuration needs additional changes - right now, as I understand, it will only build for merge requests, as witnessed by having no run for the latest
master
commit here: https://iffgit.fz-juelich.de/empyre/empyre/-/pipelines - so the upload to PyPI for atag
run also probably won't work.Maybe something like this would work?
workflow: rules: - when: always
Or do we need to exclude anything explicitly?
Docs for
workflow
: https://docs.gitlab.com/ee/ci/yaml/workflow.htmladded 7 commits
- 6509595a - Update .gitlab-ci.yml file
- 14b305ed - Update .gitlab-ci.yml file
- d6b372d5 - Update .gitlab-ci.yml to turn on MR pipelines
- 0e115e8f - Add tests to MANIFEST
- b2af05ae - Fix for (None,) out_arr tuple numpy error
- fcf18cf5 - Add doc requirements and remove environment.yml
- 5267a9c2 - Install CI docs requirements from setup.cfg
Toggle commit listNeeds a rebase, then this MR should be ready to merge. @jan-car if you find the time, please have a look. The CI things we can fix separately.
added 7 commits
-
ac987861 - 1 commit from branch
empyre:master
- cda1bc0c - Update .gitlab-ci.yml file
- 578f09e7 - Update .gitlab-ci.yml file
- 8f1f9d98 - Add tests to MANIFEST
- 0c29fb88 - Fix for (None,) out_arr tuple numpy error
- fd8f5879 - Add doc requirements and remove environment.yml
- 672aa30a - Install CI docs requirements from setup.cfg
Toggle commit list-
ac987861 - 1 commit from branch
mentioned in commit f16dec4d