Skip to content

fix: update sphinx resource hyperlink#217

Merged
skjerns merged 1 commit intoholgern:masterfrom
emmanuel-ferdman:wip
Jul 13, 2023
Merged

fix: update sphinx resource hyperlink#217
skjerns merged 1 commit intoholgern:masterfrom
emmanuel-ferdman:wip

Conversation

@emmanuel-ferdman
Copy link
Copy Markdown
Contributor

PR Summary:
The PR contains a fix to the Sphinx broken hyperlink found in the docs.

@DimitriPapadopoulos
Copy link
Copy Markdown
Contributor

Rebasing against master should fix the ImportError: cannot import name 'Tester' from 'numpy.testing' CI error.

@emmanuel-ferdman
Copy link
Copy Markdown
Contributor Author

@DimitriPapadopoulos Updated, thanks.

@DimitriPapadopoulos
Copy link
Copy Markdown
Contributor

I am afraid you'll have to rebase against the master branch to resolve conflicts.

@emmanuel-ferdman
Copy link
Copy Markdown
Contributor Author

@DimitriPapadopoulos rebased, thanks

pytest --cov=./pyedflib/ --cov-report=xml --cov-config=.coveragerc
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v3
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Something's wrong here. The master branch already has @v3 instead of @v2.

runs-on: ubuntu-20.04
steps:
- uses: actions/download-artifact@v2
- uses: actions/download-artifact@v3
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same here.

BDF+ format.

Use EDFbrowser to view these files: http://www.teuniz.net/edfbrowser/
Use EDFbrowser to view these files: https://www.teuniz.net/edfbrowser/
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Same here.

Copy link
Copy Markdown
Contributor

@DimitriPapadopoulos DimitriPapadopoulos left a comment

Choose a reason for hiding this comment

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

I'll try to rebase your branch myself and try to understand the problem.

Signed-off-by: emmanuel-ferdman <emmanuelferdman@gmail.com>
@emmanuel-ferdman
Copy link
Copy Markdown
Contributor Author

Hi @DimitriPapadopoulos, I started over by creating a fresh branch based on the most recent updates in the "master" branch. I made the necessary modifications on this new branch and performed a forced push. This should ensure that everything is now in a valid state.

@DimitriPapadopoulos
Copy link
Copy Markdown
Contributor

DimitriPapadopoulos commented Jun 28, 2023

@skjerns Much better!! I think it is ready for merge.

@emmanuel-ferdman
Copy link
Copy Markdown
Contributor Author

Please go ahead @DimitriPapadopoulos @skjerns

@skjerns skjerns merged commit cc07c3f into holgern:master Jul 13, 2023
@skjerns
Copy link
Copy Markdown
Collaborator

skjerns commented Jul 13, 2023

thanks!

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