Fixing builds

Makefile

@@ -156,7 +156,7 @@ test-namespaced-packages:
 	# This expression checks that everything in kolibri/dist has an __init__.py
 	# To prevent namespaced packages from suddenly showing up
 	# https://github.com/learningequality/kolibri/pull/2972
-	! find kolibri/dist -mindepth 1 -maxdepth 1 -type d -not -name __pycache__ -not -name cext -not -name py2only -exec ls {}/__init__.py \; 2>&1 | grep  "No such file"
+	! find kolibri/dist -mindepth 1 -maxdepth 1 -type d -not -name __pycache__ -not -name cext -not -name py2only -not -name *dist-info -exec ls {}/__init__.py \; 2>&1 | grep  "No such file"
 
 clean-staticdeps:
 	rm -rf kolibri/dist/* || true # remove everything
@@ -165,7 +165,6 @@ clean-staticdeps:
 staticdeps: clean-staticdeps
 	test "${SKIP_PY_CHECK}" = "1" || python2 --version 2>&1 | grep -q 2.7 || ( echo "Only intended to run on Python 2.7" && exit 1 )
 	pip2 install -t kolibri/dist -r "requirements.txt"
-	rm -rf kolibri/dist/*.dist-info  # pip installs from PyPI will complain if we have more than one dist-info directory.
 	rm -rf kolibri/dist/*.egg-info
 	rm -r kolibri/dist/man kolibri/dist/bin || true # remove the two folders introduced by pip 10
 	python2 build_tools/py2only.py # move `future` and `futures` packages to `kolibri/dist/py2only`
@@ -175,8 +174,6 @@ staticdeps-cext:
 	rm -rf kolibri/dist/cext || true # remove everything
 	python build_tools/install_cexts.py --file "requirements/cext.txt" # pip install c extensions
 	pip install -t kolibri/dist/cext -r "requirements/cext_noarch.txt" --no-deps
-	rm -rf kolibri/dist/*.dist-info  # pip installs from PyPI will complain if we have more than one dist-info directory.
-	rm -rf kolibri/dist/cext/*.dist-info  # pip installs from PyPI will complain if we have more than one dist-info directory.
 	rm -rf kolibri/dist/*.egg-info
 	make test-namespaced-packages
 

kolibri/plugins/device/assets/src/views/DeviceSettingsPage/__test__/DeviceSettingsPage.spec.js

@@ -56,14 +56,18 @@ async function makeWrapper() {
 }
 
 function getButtons(wrapper) {
-  const radioButtons = wrapper.findAllComponents({ name: 'KRadioButton' });
-  const saveButton = wrapper.findComponent({ name: 'KButton' });
+  const saveButton = wrapper.findComponent('[data-test="saveButton"]');
+  const learnPage = wrapper.findComponent('[data-test="landingPageButton"]');
+  const signInPage = wrapper.findComponent('[data-test="signInPageButton"]');
+  const allowGuestAccess = wrapper.findComponent('[data-test="allowGuestAccessButton"]');
+  const disallowGuestAccess = wrapper.findComponent('[data-test="disallowGuestAccessButton"]');
+  const lockedContent = wrapper.findComponent('[data-test="lockedContentButton"]');
   return {
-    learnPage: radioButtons.at(0),
-    signInPage: radioButtons.at(1),
-    allowGuestAccess: radioButtons.at(2),
-    disallowGuestAccess: radioButtons.at(3),
-    lockedContent: radioButtons.at(4),
+    learnPage,
+    signInPage,
+    allowGuestAccess,
+    disallowGuestAccess,
+    lockedContent,
     saveButton,
   };
 }

kolibri/plugins/device/assets/src/views/DeviceSettingsPage/index.vue

@@ -60,33 +60,38 @@
         <div class="fieldset">
           <label class="fieldset-label">{{ $tr('landingPageLabel') }}</label>
           <KRadioButton
+            data-test="landingPageButton"
             :label="$tr('learnerAppPageChoice')"
             :value="landingPageChoices.LEARN"
             :currentValue="landingPage"
             @input="handleLandingPageChange"
           />
           <KRadioButton
+            data-test="signInPageButton"
             :label="$tr('signInPageChoice')"
             :value="landingPageChoices.SIGN_IN"
             :currentValue="landingPage"
             @input="handleLandingPageChange"
           />
           <div class="fieldset" style="margin-left: 32px">
             <KRadioButton
+              data-test="allowGuestAccessButton"
               :label="$tr('allowGuestAccess')"
               :value="SignInPageOptions.ALLOW_GUEST_ACCESS"
               :currentValue="signInPageOption"
               :disabled="disableSignInPageOptions"
               @input="handleSignInPageChange"
             />
             <KRadioButton
+              data-test="disallowGuestAccessButton"
               :label="$tr('disallowGuestAccess')"
               :value="SignInPageOptions.DISALLOW_GUEST_ACCESS"
               :currentValue="signInPageOption"
               :disabled="disableSignInPageOptions"
               @input="handleSignInPageChange"
             />
             <KRadioButton
+              data-test="lockedContentButton"
               :label="$tr('lockedContent')"
               :value="SignInPageOptions.LOCKED_CONTENT"
               :currentValue="signInPageOption"
@@ -231,6 +236,7 @@
           :text="coreString('saveChangesAction')"
           appearance="raised-button"
           primary
+          data-test="saveButton"
           @click="handleClickSave"
         />
       </section>

requirements/build.txt

@@ -3,6 +3,7 @@
 # This does not depend on runtime stuff so we do not
 # include base.txt
 pex<1.6
+pip>=20.1
 setuptools>=20.3,<41,!=34.*,!=35.*  # https://github.com/pantsbuild/pex/blob/master/pex/version.py#L6 # pyup: ignore
 beautifulsoup4==4.8.2
 requests==2.21.0