feat: add atlas step to the build - FC-0012 #49

shadinaif · 2023-11-15T06:44:42Z

Adding the pull behind a feature flag until it's fully implemented

IMPORTANT: This PR needs these to be merged first

Background

This contribution is part of the FC-0012 project which is sparked by the Translation Infrastructure update OEP-58.

shadinaif · 2023-11-15T06:45:25Z

Please review @OmarIthawi, @regisb

OmarIthawi

One change and this should look good. Thanks @shadinaif!

tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile

shadinaif · 2023-11-19T06:59:43Z

Done @OmarIthawi . Also, this PR needs openedx/ecommerce#4051 to be merged first. And that's for one reason: atlas is added to requirements in ecommerce PR

OmarIthawi

Thanks @shadinaif! Looks good to me.

I will test again after the ecommerce pull request is merged.

brian-smith-tcril · 2023-12-12T17:25:41Z

@OmarIthawi openedx/ecommerce#4051 has been merged.

@shadinaif it looks like this one needs a rebase

OmarIthawi · 2023-12-13T09:46:24Z

Thanks @brian-smith-tcril for taking care of the ecommerce PR! Yup, Quince has been tagged. So this one will land post-quince.

We'll rebase, test and let you know when it's ready.

shadinaif · 2023-12-14T11:18:54Z

rebased, thank you @brian-smith-tcril

OmarIthawi

@shadinaif please refactor in favor of the new integration:

OmarIthawi · 2024-01-15T18:03:34Z

tutorecommerce/plugin.py

@@ -31,6 +31,7 @@
        "OAUTH2_KEY_SSO": "ecommerce-sso",
        "OAUTH2_KEY_SSO_DEV": "ecommerce-sso-dev",
        "WORKER_JWT_ISSUER": "ecommerce-worker",  # TODO do we need to keep this?
+        "ATLAS_PULL": False,


Please remove this variable. No feature flag is required anymore.

tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile

OmarIthawi

LGTM. I think this is ready to get merged unless we want to use the new --revision argument.

OmarIthawi · 2024-01-22T15:58:13Z

tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile

@@ -79,6 +80,9 @@ RUN cd /openedx/requirements/ \
 {% for extra_requirement in ECOMMERCE_EXTRA_PIP_REQUIREMENTS %}RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared,uid=${APP_USER_ID} pip install '{{ extra_requirement }}'
 {% endfor %}

+RUN atlas pull --repository="{{ ATLAS_REPOSITORY }}" --branch="{{ ATLAS_REVISION }}" {{ ATLAS_OPTIONS }} translations/ecommerce/ecommerce/conf/locale:ecommerce/conf/locale


@shadinaif There's a very new addition to atlas:

feat: rename --branch to --revision openedx/openedx-atlas#49

Would you like to implement it in this pull request or create a new one after this one is merged?

Suggested change

RUN atlas pull --repository="{{ ATLAS_REPOSITORY }}" --branch="{{ ATLAS_REVISION }}" {{ ATLAS_OPTIONS }} translations/ecommerce/ecommerce/conf/locale:ecommerce/conf/locale

RUN atlas pull --repository="{{ ATLAS_REPOSITORY }}" --revision="{{ ATLAS_REVISION }}" {{ ATLAS_OPTIONS }} translations/ecommerce/ecommerce/conf/locale:ecommerce/conf/locale

cc: @Faraz32123 @brian-smith-tcril

@shadinaif could you please accept that suggestion?

Meanwhile, I've upgraded the ecommerce PR:

chore: bump openedx-atlas==0.6.0 openedx/ecommerce#4108

We need to merge that one first.

updated and rebased, waiting for 4108 to be merged

OmarIthawi · 2024-01-25T08:58:35Z

@Faraz32123 This is now ready for merge.

Thanks @shadinaif for the work.

Faraz32123 · 2024-01-25T09:00:32Z

@shadinaif please add changelog entry.

Adding the pull behind a feature flag until it's fully implemented Refs: FC-0012 OEP-58

shadinaif · 2024-01-25T09:32:22Z

Change log added @Faraz32123 , thank you!

Faraz32123

LGTM!

OmarIthawi · 2024-01-25T21:25:03Z

changelog.d/20240125_122858_shadinaif_FC_0012_OEP_58.md

@@ -0,0 +1 @@
+💥[Feature] Add support to `atlas pull` - FC-0012 project, OEP-58. (by @shadinaif) -->


@shadinaif I found few typos after merging this pull request. Please fix them if needed.

Suggested change

💥[Feature] Add support to `atlas pull` - FC-0012 project, OEP-58. (by @shadinaif) -->

- [Feature] Add support to `atlas pull` - FC-0012 project, OEP-58. (by @shadinaif)

cc: @Faraz32123

thank @OmarIthawi , fixed here #66

OmarIthawi reviewed Nov 18, 2023

View reviewed changes

tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile Outdated Show resolved Hide resolved

OmarIthawi reviewed Nov 18, 2023

View reviewed changes

tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile Outdated Show resolved Hide resolved

shadinaif force-pushed the shadinaif/FC-0012-OEP-58 branch from 5bf64a0 to eb3625d Compare November 19, 2023 05:53

shadinaif requested a review from OmarIthawi November 19, 2023 05:58

shadinaif force-pushed the shadinaif/FC-0012-OEP-58 branch from eb3625d to 2491e47 Compare November 19, 2023 06:01

OmarIthawi reviewed Nov 19, 2023

View reviewed changes

regisb requested a review from Faraz32123 November 21, 2023 07:53

regisb assigned Faraz32123 Nov 21, 2023

shadinaif force-pushed the shadinaif/FC-0012-OEP-58 branch from 2491e47 to 2c54970 Compare November 26, 2023 08:33

shadinaif changed the title ~~feat: Add atlas pull to Dockerfile~~ feat: add minimal atlas step to the build - FC-0012 Nov 26, 2023

shadinaif force-pushed the shadinaif/FC-0012-OEP-58 branch from 2c54970 to 1543de9 Compare November 26, 2023 08:39

shadinaif changed the title ~~feat: add minimal atlas step to the build - FC-0012~~ feat: add atlas step to the build - FC-0012 Nov 26, 2023

shadinaif force-pushed the shadinaif/FC-0012-OEP-58 branch from 1543de9 to 09bc517 Compare December 14, 2023 11:18

OmarIthawi reviewed Jan 15, 2024

View reviewed changes

shadinaif force-pushed the shadinaif/FC-0012-OEP-58 branch from 09bc517 to 2f355ad Compare January 22, 2024 09:35

shadinaif requested a review from OmarIthawi January 22, 2024 09:37

OmarIthawi approved these changes Jan 22, 2024

View reviewed changes

OmarIthawi mentioned this pull request Jan 24, 2024

chore: bump openedx-atlas==0.6.0 openedx/ecommerce#4108

Merged

shadinaif force-pushed the shadinaif/FC-0012-OEP-58 branch from 2f355ad to 6450b8a Compare January 24, 2024 12:41

shadinaif requested a review from brian-smith-tcril January 24, 2024 12:46

feat: add atlas step to the build - FC-0012

62ca854

Adding the pull behind a feature flag until it's fully implemented Refs: FC-0012 OEP-58

shadinaif force-pushed the shadinaif/FC-0012-OEP-58 branch from 6450b8a to 62ca854 Compare January 25, 2024 09:31

Faraz32123 approved these changes Jan 25, 2024

View reviewed changes

Faraz32123 merged commit 0c2e064 into overhangio:nightly Jan 25, 2024

OmarIthawi reviewed Jan 25, 2024

View reviewed changes

shadinaif deleted the shadinaif/FC-0012-OEP-58 branch January 26, 2024 11:25

shadinaif mentioned this pull request Jan 26, 2024

fix: typo in change log #66

Merged

brian-smith-tcril mentioned this pull request Mar 22, 2024

fix: re-pull Atlas translations for mounted edx-platform overhangio/tutor#1024

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add atlas step to the build - FC-0012 #49

feat: add atlas step to the build - FC-0012 #49

shadinaif commented Nov 15, 2023 •

edited

Loading

shadinaif commented Nov 15, 2023

OmarIthawi left a comment

shadinaif commented Nov 19, 2023

OmarIthawi left a comment

brian-smith-tcril commented Dec 12, 2023

OmarIthawi commented Dec 13, 2023 •

edited

Loading

shadinaif commented Dec 14, 2023

OmarIthawi left a comment

OmarIthawi Jan 15, 2024

OmarIthawi left a comment

OmarIthawi Jan 22, 2024

brian-smith-tcril Jan 23, 2024

OmarIthawi Jan 24, 2024

shadinaif Jan 24, 2024

OmarIthawi commented Jan 25, 2024

Faraz32123 commented Jan 25, 2024

shadinaif commented Jan 25, 2024

Faraz32123 left a comment

OmarIthawi Jan 25, 2024

shadinaif Jan 26, 2024

	RUN atlas pull --repository="{{ ATLAS_REPOSITORY }}" --branch="{{ ATLAS_REVISION }}" {{ ATLAS_OPTIONS }} translations/ecommerce/ecommerce/conf/locale:ecommerce/conf/locale
	RUN atlas pull --repository="{{ ATLAS_REPOSITORY }}" --revision="{{ ATLAS_REVISION }}" {{ ATLAS_OPTIONS }} translations/ecommerce/ecommerce/conf/locale:ecommerce/conf/locale

		@@ -0,0 +1 @@
		💥[Feature] Add support to `atlas pull` - FC-0012 project, OEP-58. (by @shadinaif) -->

	💥[Feature] Add support to `atlas pull` - FC-0012 project, OEP-58. (by @shadinaif) -->
	- [Feature] Add support to `atlas pull` - FC-0012 project, OEP-58. (by @shadinaif)

feat: add atlas step to the build - FC-0012 #49

feat: add atlas step to the build - FC-0012 #49

Conversation

shadinaif commented Nov 15, 2023 • edited Loading

Background

shadinaif commented Nov 15, 2023

OmarIthawi left a comment

Choose a reason for hiding this comment

shadinaif commented Nov 19, 2023

OmarIthawi left a comment

Choose a reason for hiding this comment

brian-smith-tcril commented Dec 12, 2023

OmarIthawi commented Dec 13, 2023 • edited Loading

shadinaif commented Dec 14, 2023

OmarIthawi left a comment

Choose a reason for hiding this comment

OmarIthawi Jan 15, 2024

Choose a reason for hiding this comment

OmarIthawi left a comment

Choose a reason for hiding this comment

OmarIthawi Jan 22, 2024

Choose a reason for hiding this comment

brian-smith-tcril Jan 23, 2024

Choose a reason for hiding this comment

OmarIthawi Jan 24, 2024

Choose a reason for hiding this comment

shadinaif Jan 24, 2024

Choose a reason for hiding this comment

OmarIthawi commented Jan 25, 2024

Faraz32123 commented Jan 25, 2024

shadinaif commented Jan 25, 2024

Faraz32123 left a comment

Choose a reason for hiding this comment

OmarIthawi Jan 25, 2024

Choose a reason for hiding this comment

shadinaif Jan 26, 2024

Choose a reason for hiding this comment

shadinaif commented Nov 15, 2023 •

edited

Loading

OmarIthawi commented Dec 13, 2023 •

edited

Loading