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.

Sign up for GitHub

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

Jump to bottom

Vendoring-compatible imports #316

Merged
merged 18 commits into from
Feb 17, 2021
Merged

Vendoring-compatible imports #316

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ac99f5d
imports: Make exceptions-imports compatible with vendoring
Jan 13, 2021
fe63e10
imports: Make formats-imports compatible with vendoring
Jan 13, 2021
16dbb1c
imports: Make hash-imports compatible with vendoring
Jan 13, 2021
787f965
imports: Make "*keys"-imports compatible with vendoring
Jan 13, 2021
dfe9039
imports: Make settings-imports compatible with vendoring
Jan 13, 2021
dea2b2a
imports: Make storage-imports compatible with vendoring
Jan 14, 2021
0f401fb
imports: Make util-imports compatible with vendoring
Jan 14, 2021
af6ae6a
imports: Make schema-import compatible with vendoring
Jan 14, 2021
b4a069f
gpg: Rename 'process' variables to 'gpg_process'
Jan 14, 2021
e0f5a35
imports: Make process-imports compatible with vendoring
Jan 14, 2021
f64ac96
imports: Make ed25519-import compatible with vendoring
Jan 14, 2021
3e2efa5
imports: Make gpg.util-imports compatible with vendoring
Jan 14, 2021
fdfd258
imports: Make gpg.exceptions-imports compatible with vendoring
Jan 14, 2021
81d60f3
imports: Make gpg.constants-imports compatible with vendoring
Jan 14, 2021
5150c75
imports: Make gpg.common-import compatible with vendoring
Jan 14, 2021
719d315
imports: tweak imports in gpg.constants
Jan 14, 2021
f0fbeb0
imports: Fix external imports (crypto, nacl)
Jan 14, 2021
25f112b
gpg: Remove a circular dependency
Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion securesystemslib/formats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
import six

from securesystemslib import exceptions
import securesystemslib.schema as SCHEMA
from securesystemslib import schema as SCHEMA
Copy link
Member

Choose a reason for hiding this comment

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

I guess you kept as SCHEMA to make the commit less invasive? This might be something to note in the commit message.

Copy link
Member

Choose a reason for hiding this comment

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

Let me know if you want to reword the commit message. Otherwise, I'll just go ahead and merge. :)

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes exactly. And I think I can live with that message if you can :)


# Note that in the schema definitions below, the 'SCHEMA.Object' types allow
# additional keys which are not defined. Thus, any additions to them will be
Expand Down