From 92745141e26e29eabc2ec6f7b14cb9f896cf9bc2 Mon Sep 17 00:00:00 2001 From: Jimmy Conner Date: Tue, 3 Sep 2024 22:39:30 -0500 Subject: [PATCH 1/3] Update Makefile --- Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 5b3188b..68cce5f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ --include awx/ui_next/Makefile - PYTHON := $(notdir $(shell for i in python3.9 python3; do command -v $$i; done|sed 1q)) SHELL := bash DOCKER_COMPOSE ?= docker-compose @@ -482,7 +480,7 @@ HEADLESS ?= no ifeq ($(HEADLESS), yes) dist/$(SDIST_TAR_FILE): else -dist/$(SDIST_TAR_FILE): $(UI_BUILD_FLAG_FILE) ui-next +dist/$(SDIST_TAR_FILE): $(UI_BUILD_FLAG_FILE) endif $(PYTHON) -m build -s ln -sf $(SDIST_TAR_FILE) dist/awx.tar.gz @@ -714,12 +712,10 @@ kind-dev-load: awx-kube-dev-build ## generate UI .pot file, an empty template of strings yet to be translated pot: $(UI_BUILD_FLAG_FILE) $(NPM_BIN) --prefix awx/ui --loglevel warn run extract-template --clean - $(NPM_BIN) --prefix awx/ui_next --loglevel warn run extract-template --clean ## generate UI .po files for each locale (will update translated strings for `en`) po: $(UI_BUILD_FLAG_FILE) $(NPM_BIN) --prefix awx/ui --loglevel warn run extract-strings -- --clean - $(NPM_BIN) --prefix awx/ui_next --loglevel warn run extract-strings -- --clean ## generate API django .pot .po messages: @@ -766,7 +762,3 @@ help/generate: } \ { lastLine = $$0 }' $(MAKEFILE_LIST) | sort -u @printf "\n" - -## Display help for ui-next targets -help/ui-next: - @$(MAKE) -s help MAKEFILE_LIST="awx/ui_next/Makefile" From 82913837a41bd94bc7a820d771141db467781f96 Mon Sep 17 00:00:00 2001 From: Jimmy Conner Date: Tue, 3 Sep 2024 22:41:23 -0500 Subject: [PATCH 2/3] Update urls.py --- awx/urls.py | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/urls.py b/awx/urls.py index c2d7cae..0447bcb 100644 --- a/awx/urls.py +++ b/awx/urls.py @@ -11,7 +11,6 @@ urlpatterns = [ re_path(r'', include('awx.ui.urls', namespace='ui')), - re_path(r'^ui_next/.*', include('awx.ui_next.urls', namespace='ui_next')), re_path(r'^api/', include('awx.api.urls', namespace='api')), re_path(r'^api/v2/', include(resource_api_urls)), re_path(r'^sso/', include('awx.sso.urls', namespace='sso')), From a0816a205de0617aa8ee337668adaea1e4483f7d Mon Sep 17 00:00:00 2001 From: Jimmy Conner Date: Tue, 3 Sep 2024 22:43:24 -0500 Subject: [PATCH 3/3] Update MANIFEST.in --- MANIFEST.in | 1 - 1 file changed, 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index 3db512e..371bd45 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,7 +6,6 @@ recursive-include awx/templates *.html recursive-include awx/api/templates *.md *.html *.yml recursive-include awx/ui/build *.html recursive-include awx/ui/build * -recursive-include awx/ui_next/build * recursive-include awx/playbooks *.yml recursive-include awx/lib/site-packages * recursive-include awx/plugins *.ps1