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

[MRG] Use CharPyLS fork with newer cython version #1794

Merged
merged 1 commit into from May 4, 2023

Conversation

mrbean-bremen
Copy link
Member

@mrbean-bremen mrbean-bremen commented Apr 26, 2023

Note that I left the note about JPEG-LS not available for Python 3.11, because I first want to make sure that it works, and then either advice to install from source, or add an own pypi package for our fork (which I would prefer).

Tasks

  • Fix or feature added
  • Code typed and mypy shows no errors
  • Documentation updated (if relevant)
    • No warnings during build
    • Preview link (CircleCI -> Artifacts -> doc/_build/html/index.html)
  • Unit tests passing and overall coverage the same or better

@codecov
Copy link

codecov bot commented Apr 26, 2023

Codecov Report

Merging #1794 (c854f9e) into master (0f8870d) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #1794   +/-   ##
=======================================
  Coverage   97.41%   97.41%           
=======================================
  Files          66       66           
  Lines       10839    10839           
=======================================
  Hits        10559    10559           
  Misses        280      280           
Impacted Files Coverage Δ
pydicom/pixel_data_handlers/jpeg_ls_handler.py 93.33% <ø> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@mrbean-bremen mrbean-bremen marked this pull request as draft April 26, 2023 18:20
@mrbean-bremen
Copy link
Member Author

This seems to work, but I want to first decide about the PyPi package and adapt the documentation accordingly before merging.

@mrbean-bremen mrbean-bremen marked this pull request as ready for review April 27, 2023 19:16
@mrbean-bremen mrbean-bremen changed the title Use CharPyLS fork with newer cython version [MRG] Use CharPyLS fork with newer cython version Apr 27, 2023
@mrbean-bremen
Copy link
Member Author

@darcymason - there is a problem with the doc build, so I cannot view the preview. It looks like you are working on the doc build anyway, so I'm just ignoring this.

@darcymason
Copy link
Member

there is a problem with the doc build, so I cannot view the preview.

I haven't turned CircleCI off yet, so I thought it should still be there, but I haven't checked.

@mrbean-bremen
Copy link
Member Author

CircleCI is building, but it fails with:

reading sources... [ 93%] reference/uid
reading sources... [ 93%] release_notes/index

Exception occurred:
  File "/root/project/venv/lib/python3.8/site-packages/sphinx/ext/extlinks.py", line 103, in role
    title = caption % part
TypeError: not all arguments converted during string formatting
...
CircleCI received exit code 2

This seems not to be related to my changes. I didn't look into the cause, because you are working on the documentation generation anyway.

@darcymason
Copy link
Member

Oh yeah, I actually fixed that in the other PR (#1793) ... you could just borrow the additional %ss in conf.py for now, I'm not sure that PR will go through, I was just trying things.

- should fix Python 3.11 builds
- change Python version for PR tests to 3.11
- fix syntax in conf.py (taken from pydicom#1793)
- fixes pydicom#1788
@mrbean-bremen
Copy link
Member Author

Ok, I adapted the name and borrowed your fix for conf.py - I'm done here (I forgot to remove the "[MRG]" prefix, consider it re-added :)

@mrbean-bremen
Copy link
Member Author

Ping @darcymason

@darcymason
Copy link
Member

Sorry, lost track of this one. Merging now.

@darcymason darcymason merged commit 5f8210a into pydicom:master May 4, 2023
26 checks passed
@mrbean-bremen
Copy link
Member Author

Thank you!

@mrbean-bremen mrbean-bremen deleted the jpegls branch May 4, 2023 16:34
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.

JPEG LS support not available under Python 3.11
2 participants