Update python 3.14 by danielsirakov · Pull Request #186 · diffpy/diffpy.srfit

danielsirakov · 2026-06-26T17:41:27Z

…rfit into update_pre-commit # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.

…rfit into update_pre-commit

codecov · 2026-06-26T17:43:43Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 71.71%. Comparing base (a9eae82) to head (986689c).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #186      +/-   ##
==========================================
+ Coverage   71.63%   71.71%   +0.08%     
==========================================
  Files          25       25              
  Lines        3437     3437              
==========================================
+ Hits         2462     2465       +3     
+ Misses        975      972       -3

Files with missing lines	Coverage Δ
tests/test_builder.py	`100.00% <ø> (ø)`
tests/test_characteristicfunctions.py	`16.03% <100.00%> (+3.77%)`	⬆️
tests/test_constraint.py	`96.96% <ø> (ø)`
tests/test_contribution.py	`99.51% <ø> (ø)`
tests/test_equation.py	`100.00% <ø> (ø)`
tests/test_fitrecipe.py	`99.76% <ø> (ø)`
tests/test_literals.py	`99.17% <ø> (ø)`
tests/test_objcrystparset.py	`10.27% <ø> (ø)`
tests/test_profile.py	`99.33% <ø> (ø)`
tests/test_recipeorganizer.py	`99.69% <ø> (ø)`
... and 4 more

... and 1 file with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

sbillinge · 2026-06-26T19:13:18Z

We finally made it, thanks @danielsirakov but this is a horribly dirty PR at this point with lots of nasty merge commits from work done by the bot. Could we maybe redo this on a clean branch in just a few commits?

danielsirakov · 2026-06-26T21:12:35Z

Sounds good, I'll redo it

cadenmyers13

@sbillinge @danielsirakov See inline. The way docformatter 1.7.8 works can make some of the docstrings display poorly. Although, this doesn't affect the mouse-over view for users.

cadenmyers13 · 2026-06-30T18:14:18Z

This edit is made by docformatter

cadenmyers13 · 2026-06-30T18:14:49Z

Another docformatter edit that looks odd

cadenmyers13 · 2026-06-30T18:19:00Z

I would prefer if we didn't have to add these FIXME lines. Why not just use docformatter v1.7.7? This just adds technical debt and v1.7.7 works fine enough

Context: This line is added just to prevent black and docformatter conflicts. See this convo for reference: #184 (comment)

My understanding was that there is no python 3.14 support for 1.7.7

@sbillinge yes I discovered this. I'm wondering if theres a better way to handle this than just adding the extra lines but this might be fine for now

We decided this was the least technical debt. We want to keep using docformatter and we want to push out 3:14 and all the other options were way more TD

cadenmyers13 · 2026-06-30T18:41:59Z

@danielsirakov The pre-commit bot looks to be making lots of edits on your PR. This likely means you don't have pre-commit set up locally. To set it up locally,

create a new env and install pre-commit into it

conda create -n my-env pre-commit

activate the env

conda activate my-env

install pre-commit hooks

pre-commit install

This will run pre-commit every time you make a commit. This makes life a lot easier for you too because you will not have to deal with differences in your remote branch and local branch 😅 . Let me know if you need help with anything!

danielsirakov · 2026-06-30T19:05:49Z

Hi Caden, I redid this as a new PR (#187), which got merged to main as this one was carrying over my long and messy history from a previous PR (#184). I shouldn't have left this PR open after doing that, so sorry for any confusion. Also, I was able to figure out the issues with the pre-commit bot's edits, but I still appreciate the help : ) I'll check if the odd docformatter edits are still there in the version that got merged to main

cadenmyers13 · 2026-06-30T19:07:44Z

@danielsirakov Okay no problem. Let me know what you find. Can you please close this then?

danielsirakov · 2026-06-30T19:46:44Z

I ended up finding that the weird stuff docformatter was doing is still present in the version that got merged to main. We had a lot of issues with docstrings (especially with triple quotes) and docformatter in PR (#184), and we had a couple of workarounds and solutions in that PR as well. I could double-check if this is something that we have a known solution for or if this is a new issue later today, and we could figure out the best approach from there.

sbillinge · 2026-06-30T20:27:52Z

Please see my comments on Slack about docformatter. @cadenmyers13 we basically went through the whole thought process you are having wrt the docformatter update earlier in the summer when you were away and arrived back to where we are now.

cadenmyers13 · 2026-06-30T20:30:21Z

@sbillinge I saw it. thanks! its clear to me.

cadenmyers13 · 2026-06-30T20:32:23Z

@sbillinge I am going to try to spend some time (might have to be next week) getting v3.3.0 merged to main so we can release the deprecation warnings. I would really like to get that effort release ASAP

danielsirakov and others added 19 commits May 30, 2026 18:32

chore: update pre-commit

144994c

[pre-commit.ci] auto fixes from pre-commit hooks

63dfe87

chore: fix docformatter and black conflict

bb3c635

chore: run pre-commit for file I missed

cc6ae96

[pre-commit.ci] auto fixes from pre-commit hooks

8977ae6

chore: add #FIXME workaround

3b3f610

chore: add #FIXME workaround

9dedf07

[pre-commit.ci] auto fixes from pre-commit hooks

526a6b4

chore: add another #FIXME workaround

d6dcdab

Merge branch 'update_pre-commit' of github.com:danielsirakov/diffpy.s…

58d0a66

…rfit into update_pre-commit

chore: add another #FIXME workaround

8a67499

[pre-commit.ci] auto fixes from pre-commit hooks

c39542a

chore: moved import statement to the top of import modules

c824bf4

chore: moved import statement to the top of import modules

99c5381

[pre-commit.ci] auto fixes from pre-commit hooks

a8ae0bb

chore: added try except workaround

92e5781

Merge branch 'update_pre-commit' of github.com:danielsirakov/diffpy.s…

564fa2c

…rfit into update_pre-commit

release: update python support to 3.14

986689c

cadenmyers13 reviewed Jun 30, 2026

View reviewed changes

danielsirakov closed this Jun 30, 2026

Uh oh!

Conversation

danielsirakov commented Jun 26, 2026

Uh oh!

codecov Bot commented Jun 26, 2026

Codecov Report

Uh oh!

sbillinge commented Jun 26, 2026

Uh oh!

danielsirakov commented Jun 26, 2026

Uh oh!

cadenmyers13 left a comment

Choose a reason for hiding this comment

Uh oh!

cadenmyers13 Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

cadenmyers13 Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

cadenmyers13 Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

sbillinge Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

cadenmyers13 Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

sbillinge Jun 30, 2026

Choose a reason for hiding this comment

Uh oh!

cadenmyers13 commented Jun 30, 2026

Uh oh!

danielsirakov commented Jun 30, 2026

Uh oh!

cadenmyers13 commented Jun 30, 2026

Uh oh!

danielsirakov commented Jun 30, 2026

Uh oh!

sbillinge commented Jun 30, 2026

Uh oh!

cadenmyers13 commented Jun 30, 2026

Uh oh!

cadenmyers13 commented Jun 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants