Skip to content

chore: refactor pytest fixtures and sync pyproject.toml and pre-commit file with main#188

Open
cadenmyers13 wants to merge 8 commits into
diffpy:v3.3.0from
cadenmyers13:sync-w-main-v1
Open

chore: refactor pytest fixtures and sync pyproject.toml and pre-commit file with main#188
cadenmyers13 wants to merge 8 commits into
diffpy:v3.3.0from
cadenmyers13:sync-w-main-v1

Conversation

@cadenmyers13

@cadenmyers13 cadenmyers13 commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

The manual edits are in conftest.py, pyproject.toml, .pre-commit-config.yaml, and small FIXME's so black and docformatter agree. All other edits are from docformatter and should mirror the edits made in PR #184

@codecov

codecov Bot commented Jun 30, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 79.07%. Comparing base (0b16bfd) to head (d2c26d6).
⚠️ Report is 1 commits behind head on v3.3.0.

Additional details and impacted files
@@            Coverage Diff             @@
##           v3.3.0     #188      +/-   ##
==========================================
- Coverage   79.08%   79.07%   -0.02%     
==========================================
  Files          25       25              
  Lines        3821     3818       -3     
==========================================
- Hits         3022     3019       -3     
  Misses        799      799              
Files with missing lines Coverage Δ
tests/conftest.py 92.21% <100.00%> (-0.69%) ⬇️
tests/test_builder.py 100.00% <ø> (ø)
tests/test_characteristicfunctions.py 12.38% <ø> (+0.11%) ⬆️
tests/test_constraint.py 98.30% <ø> (ø)
tests/test_equation.py 100.00% <ø> (ø)
tests/test_fitrecipe.py 99.85% <ø> (ø)
tests/test_literals.py 99.17% <ø> (ø)
tests/test_objcrystparset.py 10.27% <ø> (ø)
tests/test_profile.py 99.52% <ø> (ø)
tests/test_recipeorganizer.py 99.73% <ø> (ø)
... and 2 more
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@cadenmyers13 cadenmyers13 marked this pull request as draft June 30, 2026 21:00
@cadenmyers13 cadenmyers13 marked this pull request as ready for review June 30, 2026 21:27
@cadenmyers13

cadenmyers13 commented Jun 30, 2026

Copy link
Copy Markdown
Contributor Author

@sbillinge ready for review. The manual edits here are copied over from main (with the exception of the FIXME's).

@sbillinge

Copy link
Copy Markdown
Contributor

@cadenmyers13 this won't merge for some reason. It is saying it is out of date with head or something like that

@sbillinge

Copy link
Copy Markdown
Contributor

Btw I don't remember why we are using v3.3.0 as our base branch
Does anyone remember?

@stevenhua0320

Copy link
Copy Markdown
Contributor

I got the reason why we previously open this branch, it is because at that time we were busy with the CamelCase deprecation job and we decide open a branch to perform all the actions there and then when we are done with this we would merge v3.3.0 into main. But seems that in the meanwhile there is some commits that are merged to main.

@cadenmyers13

Copy link
Copy Markdown
Contributor Author

@sbillinge what @stevenhua0320 said ^^^

this won't merge for some reason. It is saying it is out of date with head or something like that

That is odd, this is what it looks like on my end:
Screenshot 2026-06-30 at 7 07 27 PM

I pushed an empty commit. did that fix it?

@stevenhua0320

Copy link
Copy Markdown
Contributor

If still the issue persists, the safest thing we could do is to revert the changes on main with pre-commit and python 3.14 bump. Those two PRs we could redo it after this branch be merged.

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.

3 participants