Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v0.17.x into develop #12539

Merged
merged 102 commits into from
Aug 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
0453d54
setup new route for quiz section order
nucleogenesis Jul 9, 2024
f176576
move section reordering to separate side panel
nucleogenesis Jul 9, 2024
6875c8c
fix button align and header sizes
nucleogenesis Jul 11, 2024
0d17d45
avoid duplicate default section_ids
nucleogenesis Jul 11, 2024
3625f99
update edit section order compound string
nucleogenesis Jul 11, 2024
f3700ca
fixes the route
AllanOXDi Jul 11, 2024
58d0f98
updates route guard
AllanOXDi Jul 12, 2024
9fb2414
restore handleselect function logic
AllanOXDi Jul 12, 2024
32d81de
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Jul 12, 2024
ba094b5
prevents reloading modal from over popping on browser
AllanOXDi Jul 12, 2024
27019b5
fixes typo
AllanOXDi Jul 12, 2024
b88e65e
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Jul 12, 2024
894ce67
add comment to clarify strange code
nucleogenesis Jul 12, 2024
2fa688c
Merge pull request #12441 from AllanOXDi/EQM-missing-model
nucleogenesis Jul 12, 2024
791cafc
Merge pull request #12432 from nucleogenesis/fix--apply-settings-quietly
nucleogenesis Jul 12, 2024
d171c6c
Ensure that a single exercise can always be selected when no exercise…
rtibbles Jul 15, 2024
69b8408
Update font subsetting and translated message files for release-v0.17.x
rtibbles Jul 15, 2024
da34cb2
Add support for punjabi.
rtibbles Jul 16, 2024
d33e9eb
Update migrations for updated supported languages.
rtibbles Jul 16, 2024
846b97f
Merge pull request #12445 from rtibbles/translations
rtibbles Jul 16, 2024
b3f4310
Fix language switcher errors
AlexVelezLl Jul 16, 2024
a63b40f
Tweak max questions warning.
rtibbles Jul 16, 2024
060e400
Simplify and fix pex filenaming.
rtibbles Jul 16, 2024
1ec3d04
Adjust CSS for button layout in EQM, so that languages with longer te…
marcellamaki Jul 16, 2024
c05fcd6
Always upload the whl file for BCK prerelease.
rtibbles Jul 16, 2024
d779742
Properly check if the current release is the latest release.
rtibbles Jul 16, 2024
cea51d2
change requirements
thesujai Jan 20, 2024
b97b650
Update pytest plugins. Remove unused pyup locks.
rtibbles Jun 27, 2024
02a8f76
Change updated skipif for pytest.
rtibbles Jun 27, 2024
21229c8
Clean up db backups after tests to prevent issues.
rtibbles Jun 27, 2024
125edae
Fix skipIf syntax.
rtibbles Jul 1, 2024
4ee0a26
Remove pytest patch now that we've upgraded.
rtibbles Jul 1, 2024
cddc236
Cleanup usage of pytest-django db mark.
rtibbles Jul 17, 2024
2deab84
Only use transaction test cases when needed by the test.
rtibbles Jul 17, 2024
062fae3
Cleanup test case inheritance to prevent duplicate runs.
rtibbles Jul 17, 2024
be57772
Use patch to prevent side effects from connection overrides.
rtibbles Jul 17, 2024
0fb20ca
Cleanup futures cleanup tests to prevent errors in threads.
rtibbles Jul 17, 2024
8111f14
Cleanup temporarily activated plugins after the test has completed.
rtibbles Jul 17, 2024
dd792fd
Properly index into the full list of attemptlogs, rather than just th…
rtibbles Jul 17, 2024
5a7f055
Remove code coverage reporting, due to difficulties supporting Python…
rtibbles Jul 17, 2024
4608263
Merge pull request #11759 from thesujai/pytest-upgrade-6.2.5
rtibbles Jul 17, 2024
9f86d23
Merge pull request #12444 from rtibbles/one_ping_only
rtibbles Jul 17, 2024
bd3f3a4
Update le utils to version compatible with Python 3.12.
rtibbles Jul 17, 2024
e3b6410
Update Kolibri for Python 3.12 support.
rtibbles Jul 17, 2024
531218a
Update CI to run tests on Python 3.12.
rtibbles Jul 17, 2024
26a55e3
Merge pull request #12453 from rtibbles/pre_release_bck
rtibbles Jul 18, 2024
48bb4c8
Fix RTL Styles
AlexVelezLl Jul 18, 2024
671ccf1
Update appendToRoot prop
AlexVelezLl Jul 18, 2024
8d5e8bd
Merge pull request #12467 from rtibbles/numbers_numbers_everywhere_bu…
rtibbles Jul 18, 2024
a45d54f
remote teleport on CategorySearchModal
AlexVelezLl Jul 22, 2024
6a2c4c6
Merge pull request #12470 from AlexVelezLl/fix-rtl-styles
AlexVelezLl Jul 23, 2024
88f29a1
Fix KSelect Overflow on Exam Page
AlexVelezLl Jul 24, 2024
e66f45e
stop infinite reloads
jredrejo Jul 25, 2024
b67e036
Merge pull request #12484 from AlexVelezLl/fix-kselect-overflow
rtibbles Jul 25, 2024
af3d8e9
Merge pull request #12488 from jredrejo/fix_error_page
rtibbles Jul 25, 2024
5b70011
Fix prop type warning.
rtibbles Jul 26, 2024
63a120b
Prevent session endpoint 500 errors when the logged in user is deleted.
rtibbles Jul 26, 2024
f2e9827
Merge pull request #12491 from rtibbles/all_by_myself_dont_wanna_be_a…
rtibbles Jul 26, 2024
209ac50
exam page: nonlarge timer put to top of page
nucleogenesis Jul 25, 2024
9b04326
exam page: include labels on dropdowns for sections & questions
nucleogenesis Jul 25, 2024
e8697a8
Update KDS version
AlexVelezLl Jul 26, 2024
a4b90fe
Merge pull request #12492 from rtibbles/back_in_timer
rtibbles Jul 26, 2024
84a0c00
Limit max questions per section to 25.
rtibbles Jul 25, 2024
4d2d137
Don't show add more questions button when already at max.
rtibbles Jul 26, 2024
30f1a7b
Disable save when the question count exceeds the max.
rtibbles Jul 27, 2024
9243d5d
Merge pull request #12448 from AlexVelezLl/fix-language-switcher-errors
rtibbles Jul 27, 2024
c61c38a
set_as_super_user is a function param
Jul 27, 2024
11a1c0b
Don't open db connection if db doesn't exist yet.
rtibbles Jul 27, 2024
a00baa8
Merge pull request #12451 from rtibbles/pexing_me_pexing_you_aha!
marcellamaki Jul 29, 2024
335e3e6
Update android installer action to latest released version.
rtibbles Jul 29, 2024
bae202c
Merge pull request #12495 from rtibbles/update_android
marcellamaki Jul 29, 2024
21672be
Add class title text truncation to AppBar, and fix overflow options i…
marcellamaki Jul 29, 2024
7f833b4
Merge pull request #12487 from rtibbles/20_questions
marcellamaki Jul 29, 2024
41982e6
Merge pull request #12494 from rtibbles/restore_preseed
rtibbles Jul 29, 2024
da999af
Translation import from crowdin 29-july-2024
marcellamaki Jul 29, 2024
47f3753
Merge pull request #12496 from marcellamaki/nav-alignment
marcellamaki Jul 29, 2024
6bdfff3
updtes class name and removes commented out code
marcellamaki Jul 29, 2024
ba0b3c3
Merge pull request #12468 from rtibbles/python3.12
marcellamaki Jul 29, 2024
b8fac50
Merge pull request #12493 from jredrejo/is_a_function_param
rtibbles Jul 30, 2024
dd739e0
Allow management of learner sync on remote content enabled devices.
rtibbles Jul 30, 2024
dad6eba
Add more edge case handling for FacilityUser and Facility getting del…
rtibbles Jul 30, 2024
8eaaacd
Add setuptools to dev and test requires to ensure proper installation…
rtibbles Jul 30, 2024
9f389ef
Merge pull request #12498 from rtibbles/disable_learner_sync
marcellamaki Jul 30, 2024
248b595
Merge pull request #12465 from marcellamaki/EQM-buttons-too-long
rtibbles Jul 30, 2024
23d1316
Create token in advance to avoid permissions issues.
rtibbles Jul 30, 2024
904ca1c
Update our inClasses boolean when we fetch classes from the backend t…
rtibbles Jul 30, 2024
5da9243
Merge pull request #12497 from marcellamaki/latest-0.17-translations-…
rtibbles Jul 30, 2024
cb11f14
Merge pull request #12500 from rtibbles/safety_first
rtibbles Jul 30, 2024
bf84c03
Update link to privacy policy to point to new kolibri privacy policy …
marcellamaki Jul 31, 2024
85dcf2b
Merge pull request #12511 from marcellamaki/update-privacy-policy-link
rtibbles Jul 31, 2024
5443f93
Don't capture pointer events in the wrapper divs of the keypad, only …
rtibbles Aug 1, 2024
0bcca51
Always put the focus on the next button after an answer has been given.
rtibbles Aug 1, 2024
69242d3
Merge pull request #12513 from rtibbles/keypad_behave
marcellamaki Aug 1, 2024
787162a
Fix error that occurs if facilityDatasetExtraFields is null.
rtibbles Aug 2, 2024
ebc9466
fix handleConfirmDelete issues in SectionEditor
nucleogenesis Jul 25, 2024
dc36695
Merge pull request #12534 from rtibbles/extra_demographics
rtibbles Aug 5, 2024
bd0b839
Merge pull request #12536 from nucleogenesis/fix-delete-section
rtibbles Aug 5, 2024
451d154
Update changelog for 0.17.0
rtibbles Aug 6, 2024
f4801fb
Merge pull request #12537 from rtibbles/0.17changelog
rtibbles Aug 6, 2024
4f240b5
Update static file uploading to retain folder structure.
rtibbles Aug 6, 2024
4fe3ac5
Ensure the blockstep waits for raspberry pi and android too.
rtibbles Aug 6, 2024
0f5561a
Merge pull request #12538 from rtibbles/auto_upload
rtibbles Aug 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@

## Reviewer checklist

- Automated test coverage is satisfactory
- PR is fully functional
- PR has been tested for [accessibility regressions](http://kolibri-dev.readthedocs.io/en/develop/manual_testing.html#accessibility-a11y-testing)
- External dependency files were updated if necessary (`yarn` and `pip`)
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/c_extensions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ jobs:
make staticdeps-cext
pip install .
# Start and stop kolibri
coverage run -p kolibri start --port=8081
coverage run -p kolibri stop
kolibri start --port=8081
kolibri stop
# Run just tests in test/
py.test --cov=kolibri --cov-report= --cov-append --color=no test/
py.test --color=no test/
no_c_ext:
name: No C Extensions
needs: pre_job
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
make staticdeps
pip install .
# Start and stop kolibri
coverage run -p kolibri start --port=8081
coverage run -p kolibri stop
kolibri start --port=8081
kolibri stop
# Run just tests in test/
py.test --cov=kolibri --cov-report= --cov-append --color=no test/
py.test --color=no test/
2 changes: 1 addition & 1 deletion .github/workflows/morango_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
INTEGRATION_TEST: 'true'
strategy:
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']

steps:
- name: Checkout repository
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr_build_kolibri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
apk:
name: Build APK file
needs: whl
uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].3
uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].4
with:
tar-file-name: ${{ needs.whl.outputs.tar-file-name }}
ref: v0.1.3
ref: v0.1.4
69 changes: 62 additions & 7 deletions .github/workflows/release_kolibri.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,25 @@ on:
types: [published]

jobs:
latest_release:
name: Check if this release is the latest release
runs-on: ubuntu-latest
outputs:
is_latest_release: ${{ steps.is_latest_release.outputs.result }}
steps:
- name: Check if the current release is the latest Kolibri release
id: is_latest_release
uses: actions/github-script@v7
with:
result-encoding: string
script: |

const { data: latestRelease } = await github.rest.repos.getLatestRelease({
owner: 'learningequality',
repo: 'kolibri',
});

return latestRelease.tag_name === '${{ github.event.release.tag_name }}';
whl:
name: Build WHL file
uses: ./.github/workflows/build_whl.yml
Expand Down Expand Up @@ -99,11 +118,11 @@ jobs:
apk:
name: Build Android APK
needs: whl
uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].3
uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].4
with:
tar-file-name: ${{ needs.whl.outputs.tar-file-name }}
release: true
ref: v0.1.3
ref: v0.1.4
secrets:
KOLIBRI_ANDROID_APP_PRODUCTION_KEYSTORE: ${{ secrets.KOLIBRI_ANDROID_APP_PRODUCTION_KEYSTORE }}
KOLIBRI_ANDROID_APP_PRODUCTION_KEYSTORE_PASSWORD: ${{ secrets.KOLIBRI_ANDROID_APP_PRODUCTION_KEYSTORE_PASSWORD }}
Expand Down Expand Up @@ -160,13 +179,49 @@ jobs:
with:
path: 'dist/${{ matrix.filename }}'
destination: '${{ secrets.KOLIBRI_PUBLIC_RELEASE_GCS_BUCKET }}/downloads/kolibri/${{ github.event.release.name }}'
bck_prerelease_gcs_upload:
name: Upload WHL file to Google Cloud Storage for BCK Pre-release
runs-on: ubuntu-latest
needs: [whl]
steps:
- name: Download WHL artifact
uses: actions/download-artifact@v4
with:
name: ${{ needs.whl.outputs.whl-file-name }}
path: dist
- name: Zip whl file
run: zip -j dist/kolibri.zip dist/${{ needs.whl.outputs.whl-file-name }}
- uses: 'google-github-actions/auth@v2'
with:
credentials_json: '${{ secrets.GH_UPLOADER_GCP_SA_CREDENTIALS }}'
- name: 'Set up Cloud SDK'
uses: 'google-github-actions/setup-gcloud@v2'
- name: Upload to BCK bucket
uses: 'google-github-actions/upload-cloud-storage@v2'
with:
path: 'dist/kolibri.zip'
destination: '${{ secrets.BCK_PRERELEASE_BUILD_ARTIFACT_GCS_BUCKET }}'
parent: false
- name: Unzip content static files from whl file
run: |
unzip dist/${{ needs.whl.outputs.whl-file-name }} 'kolibri/core/content/static/*' -d static
mv static/kolibri/core/content/static/** static
rm -rf static/kolibri
rm static/**/*.file_size
# Ungzip all .gz files in the static folder
for f in static/**/*.gz; do gunzip -f $f; done
- name: Upload content static files to BCK bucket
uses: 'google-github-actions/upload-cloud-storage@v2'
with:
path: 'static'
destination: '${{ secrets.STUDIO_BCK_CONTENT_STATIC_BUCKET }}'
block_release_step:
# This step ties to the release environment which requires manual approval
# before it can execute. Once manual approval has been granted, the release is
# unblocked and all the subsequent steps in this workflow will happen.
name: Job to block publish of a release until it has been manually approved
if: ${{ !github.event.release.prerelease }}
needs: [whl, pex, dmg, deb, exe, test_pypi_upload]
needs: [whl, pex, dmg, deb, exe, zip, apk, test_pypi_upload]
runs-on: ubuntu-latest
environment: release
steps:
Expand All @@ -187,9 +242,9 @@ jobs:
PYPI_API_TOKEN: ${{ secrets.PYPI_API_TOKEN }}
bck_gcs_upload:
name: Upload WHL file to Google Cloud Storage for BCK
if: ${{ !github.event.release.prerelease && github.event.release.name == 'latest'}}
needs: [block_release_step, whl, latest_release]
if: ${{ !github.event.release.prerelease && needs.latest_release.outputs.is_latest_release == 'true' }}
runs-on: ubuntu-latest
needs: [block_release_step, whl]
steps:
- name: Download WHL artifact
uses: actions/download-artifact@v4
Expand All @@ -213,9 +268,9 @@ jobs:
name: Release Android App
if: ${{ !github.event.release.prerelease }}
needs: [apk, block_release_step]
uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].3
uses: learningequality/kolibri-installer-android/.github/workflows/[email protected].4
with:
version-code: ${{ needs.apk.outputs.version-code }}
ref: v0.1.3
ref: v0.1.4
secrets:
KOLIBRI_ANDROID_PLAY_STORE_API_SERVICE_ACCOUNT_JSON: ${{ secrets.KOLIBRI_ANDROID_PLAY_STORE_API_SERVICE_ACCOUNT_JSON }}
2 changes: 1 addition & 1 deletion .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
strategy:
max-parallel: 5
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11']
python-version: [3.6, 3.7, 3.8, 3.9, '3.10', '3.11', '3.12']

steps:
- uses: actions/checkout@v4
Expand Down
Loading