project loader, schema: add advanced grammar support for build-environment #3350
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cjp256
force-pushed
the
build-env-grammar
branch
from
3366aec
to
6b5ba35
Compare
|
Grammar changes are complete, I'm going to split that into it's own PR, with build-environment changes coming separately. |
cjp256
force-pushed
the
build-env-grammar
branch
from
6b5ba35
to
ffabfd2
Compare
cjp256
changed the title
cjp256
force-pushed
the
build-env-grammar
branch
from
0e0d8e8
to
551f841
Compare
Codecov Report
@@ Coverage Diff @@
## master #3350 +/- ##
==========================================
- Coverage 90.75% 90.73% -0.02%
==========================================
Files 257 256 -1
Lines 18230 18206 -24
==========================================
- Hits 16544 16520 -24
Misses 1686 1686
Continue to review full report at Codecov.
|
…nment Drop the _list_of_dicts_to_env() conversion and account for the data structure as-is when using it. Signed-off-by: Chris Patterson <chris.patterson@canonical.com>
cjp256
force-pushed
the
build-env-grammar
branch
from
551f841
to
a2f6c76
Compare
|
Units are failing |
sergiusens
approved these changes
Jan 14, 2021
sergiusens
requested changes
Jan 14, 2021
| @@ -646,7 +641,7 @@ def _generate_part_env(self, step: steps.Step) -> str: | |||
| for k, v in plugin_environment.items(): | |||
| print(f'export {k}="{v}"', file=run_environment) | |||
| print("## User Environment", file=run_environment) | |||
| for env in user_build_environment: | |||
| for env in self.build_environment: | |||
There was a problem hiding this comment.
Suggested change
| for env in self.build_environment: | |
| # Part's (user) say. | |
| for env in self.build_environment: |
| @@ -646,7 +641,7 @@ def _generate_part_env(self, step: steps.Step) -> str: | |||
| for k, v in plugin_environment.items(): | |||
| print(f'export {k}="{v}"', file=run_environment) | |||
| print("## User Environment", file=run_environment) | |||
| for env in user_build_environment: | |||
| for env in self.build_environment: | |||
There was a problem hiding this comment.
or (I prefer this even if it is more code) combined with the change some lines of code prior
Suggested change
| for env in self.build_environment: | |
| for env in user_build_environment: |
| @@ -630,9 +628,6 @@ def _generate_part_env(self, step: steps.Step) -> str: | |||
| else: | |||
| plugin_environment = dict() | |||
|
|
|||
| # Part's (user) say. | |||
| user_build_environment = self._part_properties["build-environment"] | |||
There was a problem hiding this comment.
code suggestions not working for removed lines, I would keep user_build_environment but = self.build_environment
This makes the code obvious to casual readers. The "user" part of this variable name was your idea ;-)
There was a problem hiding this comment.
Makes sense, will do
added 2 commits
January 14, 2021 12:35
Signed-off-by: Chris Patterson <chris.patterson@canonical.com>
|
Only test failing is plainbox. |
sergiusens
approved these changes
Jan 14, 2021
abitrolly
pushed a commit
to abitrolly/snapcraft
that referenced
this pull request
Mar 31, 2021
…nment (canonical#3350) Drop the _list_of_dicts_to_env() conversion and account for the data structure as-is when using it. Signed-off-by: Chris Patterson <chris.patterson@canonical.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.