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

Fix import template tests on windows #2437

Merged
merged 2 commits into from
Jun 15, 2023
Merged

Conversation

rjgildea
Copy link
Contributor

Call dials_data with pathlib=True to avoid warning

Call dials_data with pathlib=True to avoid warning
@rjgildea rjgildea requested a review from ndevenish June 15, 2023 08:29
@rjgildea rjgildea marked this pull request as ready for review June 15, 2023 08:29
rjgildea added a commit to regro-cf-autotick-bot/dials-feedstock that referenced this pull request Jun 15, 2023
@codecov
Copy link

codecov bot commented Jun 15, 2023

Codecov Report

Merging #2437 (003194c) into main (0846c08) will decrease coverage by 0.04%.
The diff coverage is 100.00%.

❗ Current head 003194c differs from pull request most recent head 67ce58a. Consider uploading reports for the commit 67ce58a to get more accurate results

@@            Coverage Diff             @@
##             main    #2437      +/-   ##
==========================================
- Coverage   78.69%   78.66%   -0.04%     
==========================================
  Files         606      606              
  Lines       74017    74017              
  Branches    10066    10066              
==========================================
- Hits        58249    58224      -25     
- Misses      13630    13654      +24     
- Partials     2138     2139       +1     

rjgildea added a commit to conda-forge/dials-feedstock that referenced this pull request Jun 15, 2023
* updated v3.15.0

* Remove patches that should no longer be needed

* Require dxtbx==3.15

* Patch failing import test

See dials/dials#2437

* Fix path to patch

* Patching of test xfel dependency is still required

See dials#2389 and dials#2404

* Remove newsfragment cruft from patches

---------

Co-authored-by: Richard Gildea <richard.gildea@diamond.ac.uk>
@rjgildea rjgildea merged commit 294514f into main Jun 15, 2023
16 checks passed
@rjgildea rjgildea deleted the fix-import-template-test-windows branch June 15, 2023 11:12
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.

None yet

2 participants