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

Make compatible with new AA and Nemo #1613

Merged
merged 7 commits into from
Sep 19, 2024

Conversation

lgoettgens
Copy link
Contributor

@lgoettgens lgoettgens commented Sep 19, 2024

I cherry-pick the changes from all other fixing branches here to see if CI is happy.
Progress:

Thus closes #1611, closes #1612, closes #1604, closes #1607, closes #1605.

I try to keep the history clean here, so you could maybe merge this with a merge commit, such that the cherry-picked other PRs stay separately in history.

@thofma
Copy link
Owner

thofma commented Sep 19, 2024

Does the error message mean we have to use @attr Bla bla instead of @attr bla?

@lgoettgens
Copy link
Contributor Author

Yes, I seemed to forgot one of them when I tackled the rest. Already fixed in ce43b46 (#1613).

@lgoettgens
Copy link
Contributor Author

I try to keep the history clean here, so you could maybe merge this with a merge commit, such that the cherry-picked other PRs stay separately in history.

@lgoettgens lgoettgens closed this Sep 19, 2024
@lgoettgens lgoettgens reopened this Sep 19, 2024
@lgoettgens lgoettgens force-pushed the lg/Nemo-AA-compat branch 2 times, most recently from c837862 to 470e13e Compare September 19, 2024 11:20
@lgoettgens
Copy link
Contributor Author

needed: Nemocas/Nemo.jl#1856

@thofma
Copy link
Owner

thofma commented Sep 19, 2024

Where exactly? I am not a big fan of this

@lgoettgens
Copy link
Contributor Author

wild_ram = collect(keys(factor(n).fac))

has another factor(::Int) call.
The following error is thrown in .

You can try to adapt that function if you want. I'll wait until you either approve Nemocas/Nemo.jl#1856 or push a fix here (but watch out as I force-pushed this branch in the last hour or so).

src/FieldFactory/conductors_generic.jl Outdated Show resolved Hide resolved
src/FieldFactory/conductors_generic.jl Outdated Show resolved Hide resolved
Copy link

codecov bot commented Sep 19, 2024

Codecov Report

Attention: Patch coverage is 71.51515% with 47 lines in your changes missing coverage. Please review.

Project coverage is 75.79%. Comparing base (5f8c496) to head (c0dbc77).
Report is 7 commits behind head on master.

Files with missing lines Patch % Lines
src/Misc/HNFstorjohann.jl 0.00% 26 Missing ⚠️
src/NumFieldOrd/NfOrd/LinearAlgebra.jl 60.00% 6 Missing ⚠️
src/LocalField/pAdic.jl 0.00% 3 Missing ⚠️
src/FieldFactory/ab_exts.jl 66.66% 2 Missing ⚠️
src/LocalField/neq.jl 71.42% 2 Missing ⚠️
src/Sparse/Row.jl 50.00% 2 Missing ⚠️
src/AlgAssAbsOrd/PicardGroup.jl 0.00% 1 Missing ⚠️
src/HeckeTypes.jl 50.00% 1 Missing ⚠️
src/LocalField/Conjugates.jl 80.00% 1 Missing ⚠️
src/LocalField/Ring.jl 0.00% 1 Missing ⚠️
... and 2 more
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1613      +/-   ##
==========================================
- Coverage   75.95%   75.79%   -0.17%     
==========================================
  Files         362      361       -1     
  Lines      113698   113700       +2     
==========================================
- Hits        86364    86179     -185     
- Misses      27334    27521     +187     
Files with missing lines Coverage Δ
ext/GAPExt/fields.jl 94.31% <100.00%> (ø)
src/AlgAss/AbsAlgAss.jl 88.20% <100.00%> (ø)
src/AlgAss/AlgMatElem.jl 94.03% <ø> (-3.42%) ⬇️
src/AlgAss/Elem.jl 88.54% <ø> (-0.14%) ⬇️
src/AlgAss/StructureConstantAlgebra.jl 93.44% <ø> (ø)
src/AlgAssAbsOrd/Elem.jl 86.03% <ø> (+1.52%) ⬆️
src/AlgAssAbsOrd/LocallyFreeClassGroup.jl 92.47% <ø> (ø)
src/AlgAssAbsOrd/Order.jl 75.21% <ø> (ø)
src/AlgAssAbsOrd/PIP.jl 14.36% <ø> (ø)
src/Deprecations.jl 100.00% <ø> (ø)
... and 60 more

... and 39 files with indirect coverage changes

@lgoettgens
Copy link
Contributor Author

Test pass!!! 🎉 🎉

@thofma thofma merged commit b11c6d9 into thofma:master Sep 19, 2024
17 checks passed
@lgoettgens lgoettgens deleted the lg/Nemo-AA-compat branch September 19, 2024 14:36
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