From 0c6b7fdb590198d33e5201e19513e3916d7508e1 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 21 May 2020 11:52:31 -0400 Subject: [PATCH 1/2] don't use symlinks for awxkit VERSION as much as I'd like this to just work, certain versions of pip just don't support it -_- see: https://github.com/ansible/awx/issues/7107 see: https://github.com/pypa/pip/issues/7555 so unfortunately, we just have to track these as two distinct files and just keep them in sync --- Makefile | 1 + awxkit/VERSION | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) mode change 120000 => 100644 awxkit/VERSION diff --git a/Makefile b/Makefile index d50e5201e8..dc5f900a1c 100644 --- a/Makefile +++ b/Makefile @@ -362,6 +362,7 @@ TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/ss # Run all API unit tests. test: + cmp VERSION awxkit/VERSION || "`cat VERSION` != `cat awxkit/VERSION`; these version files *must* match" @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ diff --git a/awxkit/VERSION b/awxkit/VERSION deleted file mode 120000 index 6ff19de4b8..0000000000 --- a/awxkit/VERSION +++ /dev/null @@ -1 +0,0 @@ -../VERSION \ No newline at end of file diff --git a/awxkit/VERSION b/awxkit/VERSION new file mode 100644 index 0000000000..b85c6c7b03 --- /dev/null +++ b/awxkit/VERSION @@ -0,0 +1 @@ +11.2.0 From d35e87ace7a12211331813cca45b74d752199940 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Thu, 21 May 2020 12:11:40 -0400 Subject: [PATCH 2/2] test that CI works for version checking --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dc5f900a1c..6f06516ee2 100644 --- a/Makefile +++ b/Makefile @@ -362,11 +362,11 @@ TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/ss # Run all API unit tests. test: - cmp VERSION awxkit/VERSION || "`cat VERSION` != `cat awxkit/VERSION`; these version files *must* match" @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ PYTHONDONTWRITEBYTECODE=1 py.test -p no:cacheprovider -n auto $(TEST_DIRS) + cmp VERSION awxkit/VERSION || "VERSION and awxkit/VERSION *must* match" cd awxkit && $(VENV_BASE)/awx/bin/tox -re py2,py3 awx-manage check_migrations --dry-run --check -n 'vNNN_missing_migration_file'