Skip to content

Examples #115

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

Closed
wants to merge 6 commits into from
Closed

Examples #115

wants to merge 6 commits into from

Conversation

trevorhardy
Copy link
Contributor

Update the two examples on the PyHELICS website to make them work under the latest PyHELICS.

@trevorhardy trevorhardy added the bug Something isn't working label Mar 7, 2025
Copy link
Contributor

@josephmckinsey josephmckinsey left a comment

Choose a reason for hiding this comment

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

Can you rebase onto main? It's quite a few commits out of date.

I tried using mkdocs build and mkdocs serve, and I couldn't click the "found here" link in usages.md:

The example files containing this code can be found here.

http://127.0.0.1:8000/usage/examples/website_usage/ returns a 404. I'm not quite sure what the intention was here, but I think mkdocs isn't happen we it.

@trevorhardy
Copy link
Contributor Author

Ok, I've got the rebase done (I think) and I updated the link. The link will be a 404 until you merge this into main as it links to a folder that doesn't exist in main yet.

@trevorhardy
Copy link
Contributor Author

It looks like there are some conflicts in the test folder that I haven't messed with (probably ever). @josephmckinsey are you able to resolve those?

@josephmckinsey
Copy link
Contributor

It looks like there are some conflicts in the test folder that I haven't messed with (probably ever). @josephmckinsey are you able to resolve those?

It looks like the branch is still really far behind main, so that's where some of the conflicts are still. If a branch is really based off of main, then it shouldn't be possible to have a merge conflict.
6 commits ahead of, 43 commits behind main.

@trevorhardy
Copy link
Contributor Author

Would it make more sense for me to take my changes, delete this branch and PR, and make a new "examples" branch from main?

@josephmckinsey
Copy link
Contributor

Would it make more sense for me to take my changes, delete this branch and PR, and make a new "examples" branch from main?

Either that or play around a bit with the git rebase options like -i until something works.

@trevorhardy trevorhardy closed this Mar 7, 2025
@trevorhardy trevorhardy deleted the examples branch March 7, 2025 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants