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

ed25519: Update to upstream master HEAD #299

Merged
merged 4 commits into from
Nov 9, 2020

Conversation

jku
Copy link
Collaborator

@jku jku commented Nov 2, 2020

Update ed2519 from 18d0b5515 to c13748e1d2.

This includes three commits that

  • fixes invalid escape sequence in docstring (our issue invalid escape sequences in docstrings #290)
  • updates CI, lint & tox configuration (not included in our copy)
  • whitespace fixes to satisfy the new linter configuration

So no functional changes but the first item should silence a
DeprecationWarning in some cases.

Fixes #298

Jussi Kukkonen added 2 commits November 2, 2020 18:27
Update ed2519 from 18d0b5515 to c13748e1d2.

This includes three commits that
* fixes invalid escape sequence in docstring (our issue secure-systems-lab#290)
* updates CI, lint & tox configuration (not included in our copy)
* whitespace fixes to satisfy the new linter configuration

So no functional changes but the first item should silence a
DeprecationWarning in some cases.

Fixes secure-systems-lab#298
@coveralls
Copy link

coveralls commented Nov 2, 2020

Coverage Status

Coverage remained the same at 98.863% when pulling aa6d876 on jku:update-ed25519 into 3bb4625 on secure-systems-lab:master.

@joshuagl
Copy link
Collaborator

joshuagl commented Nov 2, 2020

Both Python 2.7 builds failed on Travis. Did upstream make a change which isn't supported by Python 2.7? 😕

@jku
Copy link
Collaborator Author

jku commented Nov 3, 2020

Both Python 2.7 builds failed on Travis. Did upstream make a change which isn't supported by Python 2.7?

That seems to be my fault: The old version had an empty __init__.py (apparently added in sslib) and I missed that it disappeared when I wiped the contents before checking out the new version... The implicit namespacing in Python>=3.3 means that the missing file was not a problem in those versions.

I'll fix this but first I'll think if there is maybe a simple way to sure I can't mess up next time...

@jku jku marked this pull request as draft November 3, 2020 08:58
* Add advice on updating
* Add __init__.py that was mistakenly removed in commit c73a705
  (this file is not part of upstream, it is added in securesystemslib)
* Delete Travis config as it was actually deleted upstream
@jku jku marked this pull request as ready for review November 3, 2020 11:37
Copy link
Collaborator

@joshuagl joshuagl left a comment

Choose a reason for hiding this comment

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

Apart from a minor question on _vendor/README.md this looks good to me, thanks!

securesystemslib/_vendor/README.md Outdated Show resolved Hide resolved
Copy link
Member

@lukpueh lukpueh left a comment

Choose a reason for hiding this comment

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

Thanks for the impeccable work, @jku!

@lukpueh lukpueh merged commit 92da669 into secure-systems-lab:master Nov 9, 2020
@lukpueh lukpueh mentioned this pull request Nov 9, 2020
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.

ed25519 upstream has new commits
4 participants