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

Content import peer discovery #6011

Merged
merged 20 commits into from
Nov 14, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a543930
Update _kill_pid to leverage os.kill for Windows as well (Py2.7+)
jamalex Jun 12, 2019
2c3c0cf
Utils for broadcasting/scanning zeroconf Kolibri service for discovery
jamalex Jun 12, 2019
2922c0f
Pass the currently specified port through into the services functions.
jamalex Jun 12, 2019
e923e50
Register the Kolibri zeroconf service so it will be discoverable
jamalex Jun 12, 2019
7d40f1e
Gracefully clean up and unregister Kolibri zeroconf service on shutdown
jamalex Jun 12, 2019
ffe47c7
Add network search API endpoint for enumerating found Kolibri instances
jamalex Jun 12, 2019
bb2d08a
Run black and flake8 on files that still needed it to pass CI
jamalex Jun 12, 2019
6648666
Fix zeroconf github URL in requirements.txt
jamalex Jun 12, 2019
a75293d
Remove .egg-info directories from kolibri/dist as they cause errors
jamalex Jun 12, 2019
8ae6bbc
Update to Morango 0.4.6
jamalex Jun 13, 2019
df7523b
Gracefully handle server being started within a thread (e.g. Android)
jamalex Jun 15, 2019
2881db3
Initial prototype frontend code for zeroconf device discovery.
jamalex Jun 17, 2019
6dec95c
Add base_url to network search results expectations for tests
jamalex Jun 17, 2019
7c07682
Put facility name in radio item for device list
jamalex Jun 17, 2019
30e13a8
Update zeroconf to 0.19.3 from PyPI
jamalex Jun 20, 2019
b51c9a0
Merge latest develop branch into zeroconf WIP branch
micahscopes Nov 12, 2019
52eed34
Rough implementation of latest peer importing designs.
micahscopes Nov 13, 2019
a40c1fc
reset changes made to utils/system.py
micahscopes Nov 14, 2019
ae7bb70
remove debugging line
micahscopes Nov 14, 2019
9e13f66
Fixed typo
micahscopes Nov 14, 2019
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
  •  
  •  
  •  
15 changes: 6 additions & 9 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ steps:

- wait

# NOTE: Uploading artifacts should only happen once. Doing so twice during the
# release process causes an error, which blocks the execution of the steps.
- label: Upload artifacts
command: .buildkite/setup_and_upload_artifact.sh

Expand All @@ -34,21 +36,16 @@ steps:

- wait

- block: "Create integration testing worksheet?"
- label: Create integration testing
command: .buildkite/build_worksheet.sh

- block: "Sign Windows installer?"
- label: Sign Windows installer
command: .buildkite/sign_windows_installer.bat
agents:
queue: "windows-sign"

- block: "Create integration testing worksheet?"
- label: Create integration testing
command: .buildkite/build_worksheet.sh

- wait

- label: Upload new artifacts
command: .buildkite/setup_and_upload_artifact.sh

- block: "Build release APK?"
- label: "Build Release APK"
env:
Expand Down
9 changes: 7 additions & 2 deletions .buildkite/upload_artifacts.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def create_status_report_html(artifacts):
if artifact["category"] != current_heading:
current_heading = artifact["category"]
html += "<h2>{heading}</h2>\n".format(heading=current_heading)
html += "<p>{description}: <a href='{media_url}'>{name}</a></p>\n".format(
html += "<p>{description}: <a href='{media_url}'>{name}</a> ({size_mb} MB)</p>\n".format(
**artifact
)
html += "</body>\n</html>"
Expand Down Expand Up @@ -203,7 +203,12 @@ def upload_artifacts():
)
blob.upload_from_filename(filename=file_data.get("file_location"))
blob.make_public()
file_data.update({"media_url": blob.media_link})
file_data.update(
{
"size_mb": os.path.getsize(file_data.get("file_location")) / 1048576.0,
"media_url": blob.media_link,
}
)
indirectlylit marked this conversation as resolved.
Show resolved Hide resolved

html = create_status_report_html(artifacts)

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ kolibrihome_test/
# Translations
*.mo
kolibri/locale/en/
kolibri/locale/CSV_FILES/**/*

# Mr Developer
.mr.developer.cfg
Expand Down Expand Up @@ -94,6 +95,7 @@ js-dist
# Content App
storage/*
kolibri/content/content_db/*.sqlite3
kolibri/core/content/contentschema/migrations/*

# virtual environment
venv/
Expand Down
19 changes: 19 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ matrix:
- python: "2.7"
env:
- TOX_ENV=pythonlint2
script:
- tox -e $TOX_ENV
- python: "3.6"
env:
- TOX_ENV=pythonlint3
Expand All @@ -32,12 +34,18 @@ matrix:
- python: "2.7"
env:
- TOX_ENV=licenses
script:
- tox -e $TOX_ENV
- python: "2.7"
env:
- TOX_ENV=py2.7
script:
- tox -e $TOX_ENV
- python: "3.5"
env:
- TOX_ENV=docs
script:
- tox -e $TOX_ENV
- python: "3.4"
env:
- TOX_ENV=py3.4
Expand All @@ -55,12 +63,16 @@ matrix:
- python: "2.7"
env:
- TOX_ENV=node10.x
script:
- tox -e $TOX_ENV
- python: "3.5"
env:
- TOX_ENV=postgres
- python: "2.7"
env:
- TOX_ENV=frontendlint
script:
- tox -e $TOX_ENV
- python: "2.7"
env:
- TOX_ENV=nocext
Expand Down Expand Up @@ -99,6 +111,13 @@ before_script:

# command to run tests
script:
# Get static deps in order to try and compile them all for Python 3
- SKIP_PY_CHECK=1 make staticdeps
# Ensures that we can compile all source code files in this Python 3+ version
# This behavior is disabled in the 'include' matrix above for Python 2.7
- make staticdeps-compileall
# Remove staticdeps again, so they are not part of tox
- make clean-staticdeps
- tox -e $TOX_ENV

after_success:
Expand Down
92 changes: 76 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,66 @@

List of the most important changes for each release.

## 0.13.0 (unreleased)

### Changed or fixed

- Fixed: Unclean shutdowns on very large databases, due to prolonged database cleanup

## 0.12.9

### Changed or fixed

- Database vacuum now works correctly
- Fixes related to network detection
- Improve performance of classroom API endpoint to prevent request timeouts

### Added

- Improved error reporting in Windows

([0.12.9 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.9))

### Internationalization and localization

- Added Korean

## 0.12.8

### Changed or fixed

- Fixed: users creating accounts for themselves not being placed in their selected facility
- Fixed: images in Khan Academy exercises not appearing on occasion
- Fixed: "Usage and Privacy" modal not closing when clicking the "Close" button

([0.12.8 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.8))

## 0.12.7

(Note: 0.12.6 contained a regression and was superseded by 0.12.7)

### Changed or fixed

- Facility user table is now paginated to improve performance for facilities with large numbers of users.
- Various usability and visual improvements, including improved layout when using a RTL language
- On Windows, `kolibri.exe` is automatically added to the path in the command prompt
- Improved system clean-up when uninstalling on Windows


### Internationalization and localization

- Added Latin American Spanish (ES-419)

([0.12.7 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.7))

([0.12.6 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.6))

## 0.12.5

- Upgraded Morango to 0.4.6, fixing startup errors for some users.

([0.12.5 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.5))

## 0.12.4

### Changed or fixed
Expand All @@ -19,7 +79,7 @@ List of the most important changes for each release.
- Added a new theming system for customizing various colors that appear in Kolibri.


View all [0.12.4 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.4)
([0.12.4 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.4))

## 0.12.3

Expand All @@ -31,7 +91,7 @@ View all [0.12.4 changes on Github](https://github.com/learningequality/kolibri/
- Improved PostgreSQL support
- Added fixes related to coach tools

View all [0.12.3 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.3)
([0.12.3 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.3))


## 0.12.2
Expand Down Expand Up @@ -65,7 +125,7 @@ View all [0.12.3 changes on Github](https://github.com/learningequality/kolibri/
- Added Gujarati
- Fixed missing translations in coach group management

View all [0.12.2 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.2)
([0.12.2 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.2))


## 0.12.1
Expand All @@ -85,7 +145,7 @@ View all [0.12.2 changes on Github](https://github.com/learningequality/kolibri/

- Added Burmese

View all [0.12.1 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.1)
([0.12.1 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.1))


## 0.12.0
Expand Down Expand Up @@ -123,7 +183,7 @@ View all [0.12.1 changes on Github](https://github.com/learningequality/kolibri/

- Languages: English, Arabic, Bengali, Bulgarian, Chinyanja, Farsi, French, Fulfulde Mbororoore, Hindi, Marathi, Portuguese (Brazilian), Spanish, Swahili, Telugu, Urdu, Vietnamese, and Yoruba

View all [0.12.0 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.0)
([0.12.0 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.12.0))


## 0.11.1
Expand All @@ -148,7 +208,7 @@ View all [0.12.0 changes on Github](https://github.com/learningequality/kolibri/

- Added Fufulde Mboroore

View all [0.11.1 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.11.1)
([0.11.1 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.11.1))

## 0.11.0

Expand Down Expand Up @@ -181,7 +241,7 @@ View all [0.11.1 changes on Github](https://github.com/learningequality/kolibri/
- Many fixes to translation and localization
- Consistent font rendering across all languages

View all [0.11.0 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.11.0)
([0.11.0 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.11.0))


## 0.10.3
Expand All @@ -196,14 +256,14 @@ View all [0.11.0 changes on Github](https://github.com/learningequality/kolibri/
- Channel import listing of USB devices when non-US locale
- Counts for coach-specific content would in some cases be wrongly displayed

View all [0.10.3 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.10.3)
([0.10.3 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.10.3))

## 0.10.2

- Performance improvements and bug fixes for content import
- Exam creation optimizations

View all [0.10.2 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.10.2)
([0.10.2 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.10.2))

## 0.10.1

Expand All @@ -212,7 +272,7 @@ View all [0.10.2 changes on Github](https://github.com/learningequality/kolibri/
- Fixes for SSL issues on low-spec devices / unstable connectivity
- Compatibility fixes for older system libraries

View all [0.10.1 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.10.1)
([0.10.1 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.10.1))

## 0.10.0

Expand All @@ -229,23 +289,23 @@ View all [0.10.1 changes on Github](https://github.com/learningequality/kolibri/
- Command to migrate content directory location
- Languages: English, Arabic, Bengali, Chinyanja, Farsi, French, Hindi, Kannada, Marathi, Burmese, Portuguese (Brazilian), Spanish, Swahili, Tamil, Telugu, Urdu, Yoruba, and Zulu

View all [0.10.0 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.10.0)
([0.10.0 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.10.0))

0.9.3
-----

- Compressed database upload
- Various bug fixes

View all [0.9.3 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.9.3)
([0.9.3 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.9.3))

0.9.2
-----

- Various bug fixes
- Languages: English, Arabic, Bengali, Chinyanja, Farsi, French, Hindi, Marathi, Portuguese (Brazilian), Spanish, Swahili, Tamil, Telugu, Urdu, Yoruba, and Zulu

View all [0.9.2 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.9.2)
([0.9.2 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.9.2))

0.9.1
-----
Expand All @@ -259,7 +319,7 @@ View all [0.9.2 changes on Github](https://github.com/learningequality/kolibri/i
- Various other fixes
- Languages: English, Arabic, Chinyanja, Farsi, French, Hindi, Marathi, Portuguese (Brazilian), Spanish, Swahili, Tamil, Telugu, and Urdu

View all [0.9.1 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.9.1)
([0.9.1 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.9.1))

0.9.0
-----
Expand All @@ -277,7 +337,7 @@ View all [0.9.1 changes on Github](https://github.com/learningequality/kolibri/i
- Added icon next to language-switching functionality
- Languages: English, Arabic, Farsi, French, Hindi, Spanish, Swahili, and Urdu

View all [0.9.0 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.9.0)
([0.9.0 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.9.0))

0.8.0
-----
Expand All @@ -289,7 +349,7 @@ View all [0.9.0 changes on Github](https://github.com/learningequality/kolibri/i
- Languages: English, Spanish, Arabic, Farsi, Urdu, French, Haitian Creole, and Burmese
- Various bug fixes

View all [0.8.0 changes on Github](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.8.0)
([0.8.0 Github milestone](https://github.com/learningequality/kolibri/issues?q=label%3Achangelog+milestone%3A0.8.0))

0.7.2
-----
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016 Learning Equality
Copyright (c) 2019 Learning Equality

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ recursive-exclude kolibri/* *pyc
recursive-exclude kolibri/core/assets *
recursive-exclude kolibri/plugins/*/assets *
recursive-exclude kolibri/plugins/*/node_modules *
exclude kolibri/*/buildConfig.js
exclude kolibri/plugins/*/buildConfig.js

recursive-exclude kolibri/dist *pyc
prune kolibri/dist/*/__pycache___
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.