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 nasdf #3262

Merged
merged 17 commits into from
Dec 2, 2023
Merged

Fix nasdf #3262

merged 17 commits into from
Dec 2, 2023

Conversation

aadcg
Copy link
Member

@aadcg aadcg commented Nov 27, 2023

Description

Fixes #2981

Checklist:

Everything in this checklist is required for each PR. Please do not approve a PR that does not have all of these items.

  • Git hygiene:
    • I have pulled from master before submitting this PR
    • There are no merge conflicts.
  • I've added the new dependencies as:
    • ASDF dependencies,
    • Git submodules,
      cd /path/to/nyxt/checkout
      git submodule add https://gitlab.common-lisp.net/nyxt/py-configparser _build/py-configparser
    • and Guix dependencies.
  • My code follows the style guidelines for Common Lisp code. See:
  • I have performed a self-review of my own code.
  • My code has been reviewed by at least one peer. (The peer review to approve a PR counts. The reviewer must download and test the code.)
  • Documentation:
    • All my code has docstrings and :documentations written in the aforementioned style. (It's OK to skip the docstring for really trivial parts.)
    • I have updated the existing documentation to match my changes.
    • I have commented my code in hard-to-understand areas.
    • I have updated the changelog.lisp with my changes if it's anything user-facing (new features, important bug fix, compatibility breakage).
      • Changelog update should be a separate commit.
    • I have added a migration.lisp entry for all compatibility-breaking changes.
    • (If this changes something about the features showcased on Nyxt website) I have these changes described in the new/existing article at Nyxt website or will notify one of maintainters to do so.
  • Compilation and tests:
    • My changes generate no new warnings.
    • I have added tests that prove my fix is effective or that my feature works. (If possible.)
    • I ran the tests locally ((asdf:test-system :nyxt) and (asdf:test-system :nyxt/gi-gtk)) and they pass.

@aadcg aadcg force-pushed the fix-nasdf branch 2 times, most recently from 6e4edfa to 5cf4190 Compare November 27, 2023 18:07
@aadcg aadcg marked this pull request as draft November 27, 2023 20:37
@aadcg aadcg marked this pull request as ready for review November 29, 2023 11:53
@aadcg aadcg force-pushed the fix-nasdf branch 3 times, most recently from dc64fb4 to 25b9c90 Compare November 29, 2023 14:15
@aadcg aadcg requested review from jmercouris and aartaka November 29, 2023 14:26
@aadcg
Copy link
Member Author

aadcg commented Nov 29, 2023

Can only be merged once the following patch is accepted by Guix, https://debbugs.gnu.org/cgi/bugreport.cgi?bug=67524.

Copy link
Contributor

@aartaka aartaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. Untested due to build failures. Minor comments:

  • The changes regarding the renderer system go beyond the (I suppose) purpose of the PR—removing NASDF dependency from the submodules/libraries/etc.
  • Same goes for keymap and make-instance checking—these are nor related to NASDF, are they?
  • It's funny that you call NASDF-deleting PRs "fix" 😃

@@ -37,7 +37,7 @@ The logic is:
requiring arguments.
- If there's any other error raised by `typep', then TYPE-SPECIFIER is
likely not a type."
(or (documentation type-specifier 'type)
(or (ignore-errors (documentation type-specifier 'type))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finally.

@jmercouris
Copy link
Member

Thank you for getting rid of the matrix of tests. This is a very welcome change. I see a lot of removed lines.

@jmercouris
Copy link
Member

Well rather simplifying the matrix, to the platforms that matter for our purposes, currently.

aadcg added 2 commits December 2, 2023 15:47
Introduced in commits c0d6f95 and
3ebd7d3 to deal with the fact that NASDF was a
dependency of Nyxt and some of its CL dependencies.
@aadcg
Copy link
Member Author

aadcg commented Dec 2, 2023

  • The changes regarding the renderer system go beyond the (I suppose) purpose of the PR—removing NASDF dependency from the submodules/libraries/etc.

I believe you're referring to nyxt-renderer-system and *nyxt-renderer*. The goal of this PR is to revert the state of the affairs with regards to NASDF as it was before PR #2709 (namely reverting commit 8da7313).

  • Same goes for keymap and make-instance checking—these are nor related to NASDF, are they?

I've considered that too. I'll move it to a different PR.

@aadcg aadcg merged commit c0d087d into master Dec 2, 2023
2 checks passed
@aadcg aadcg deleted the fix-nasdf branch December 2, 2023 13:57
@aadcg aadcg mentioned this pull request Dec 2, 2023
@aadcg
Copy link
Member Author

aadcg commented Dec 2, 2023

Thank you for getting rid of the matrix of tests. This is a very welcome change. I see a lot of removed lines.

I've moved that work to #3268.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Delete nasdf from Nyxt sources
3 participants