learningequality · benjaoming · Feb 4, 2015 · Feb 4, 2015 · Feb 7, 2015 · Feb 7, 2015
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -12,7 +12,9 @@ steps:
   - label: Build windows installer
     command: .buildkite/build_windows_installer.sh
 
-  - wait
-
-  - label: Upload artifacts
-    command: .buildkite/setup_and_upload_artifacts.sh && docker image prune -f
+# Disable because Vader's virtualenv command is buggy (why?) and artifacts can be
+# found in Buildkite instead
+#  - wait
+#
+#  - label: Upload artifacts
+#    command: .buildkite/setup_and_upload_artifacts.sh && docker image prune -f
diff --git a/.buildkite/setup_and_upload_artifacts.sh b/.buildkite/setup_and_upload_artifacts.sh
@@ -7,10 +7,13 @@ PIP="$SCRIPTPATH/env/bin/pip"
 PYTHON="$SCRIPTPATH/env/bin/python"
 
 echo "Creating virtualenv..."
-virtualenv -p python3 env
+# This specifies 3.5 because of broken old server
+virtualenv -p python3.5 env
 
+$PIP freeze
+$PIP install setuptools\<44
 echo "Installing requirements..."
-$PIP install -r requirements_pipeline.txt
+$PIP install -r requirements_pipeline.txt --upgrade
 
 echo "Preparing artifact directories"
 mkdir -p dist

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,48 @@
+version: 2.1
+
+jobs:
+  build-test:
+    working_directory: ~/kalite
+    docker:
+      - image: circleci/python:2.7-stretch-node-browsers
+    steps:
+      - browser-tools/install-browser-tools:
+          install-firefox: true
+          install-geckodriver: true
+          install-chrome: false
+#          firefox-version: "74.0"
+#          geckodriver-version: "v0.26.0"
+      - checkout
+      - run: pip install -r requirements_sphinx.txt
+      - run: pip install -e .
+      - run:
+          name: "Downgrade Node.js"
+          command: |
+            curl -sSL "https://nodejs.org/dist/v6.9.5/node-v6.9.5-linux-x64.tar.xz" | sudo tar --strip-components=2 -xJ -C /usr/local/bin/ node-v6.9.5-linux-x64/bin/node
+      - run: make assets
+      - run: make docs
+      - run: firefox -v
+      - run: coverage run bin/kalite manage setup --noinput --traceback
+      - run: coverage run bin/kalite start --traceback -v2
+      - run: sleep 10s  # Necessary for server to be ready
+      - run: coverage run bin/kalite status
+      - run: coverage run bin/kalite stop --traceback -v2
+      - run: coverage run bin/kalite manage test --no-bdd
+      - run: coverage run bin/kalite manage test --bdd-only
+      - run: bash <(curl -s https://codecov.io/bash)
+      # Disable jshint
+      # - run: npm install jshint
+      # - run: jshint kalite/*/static/js/*/
+      - run:
+          name: Upload CodeCov.io Data
+          command: bash <(curl -s https://codecov.io/bash)
+          when: always # Uploads code coverage results, pass or fail
+
+orbs:
+  browser-tools: circleci/browser-tools@1.0.0
+
+workflows:
+  version: 2
+  build_and_test:
+    jobs:
+      - build-test
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+kalite/VERSION
+
 # Ignore this
 # File created by Coverage
 .coverage

diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM ubuntu:xenial
+FROM ubuntu:bionic
 
 # install latest python and nodejs
 RUN apt-get -y update && \
   apt-get install -y software-properties-common curl && \
   curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
-  apt-get -y update && apt-get install -y python2.7 python-pip git nodejs gettext wget
+  apt-get -y update && apt-get install -y python2.7 python-pip git gettext wget "nodejs=6*"
 
 COPY . /kalite
 VOLUME /kalitedist/
@@ -13,12 +13,12 @@ VOLUME /kalitedist/
 ENV PIP=/kalite/kalite_env/bin/pip
 
 # for mounting the whl files into other docker containers
-RUN pip install virtualenv && virtualenv /kalite/kalite_env  --python=python2.7
+RUN pip install pip --upgrade && pip install virtualenv && virtualenv /kalite/kalite_env  --python=python2.7
 
 RUN $PIP install -r /kalite/requirements_dev.txt \
 	&& $PIP install -r /kalite/requirements_sphinx.txt \
 	&& $PIP install -e /kalite/. \
-	&& $PIP install pex
+	&& $PIP install pex\<2.1
 
 # Override the PATH to add the path of our virtualenv python binaries first so it's python executes instead of
 # the system python.

diff --git a/Makefile b/Makefile
@@ -117,13 +117,13 @@ sdist: clean docs assets
 	python setup.py sdist --formats=$(format) --static
 	python setup.py sdist --formats=$(format)
 
-dist: clean docs assets 
+dist: clean docs assets
 	# Building assets currently creates pyc files in the source dirs,
 	# so we should delete those...
 	make clean-pyc
 	python setup.py sdist --formats=$(format)
 	python setup.py bdist_wheel
-	pip install -t kalite/packages/dist -r "requirements.txt"
+	pip install -t kalite/packages/dist -r "requirements.txt" --no-compile
 	rm -rf kalite/packages/dist/*.dist-info  # pip installs from PyPI will complain if we have more than one dist-info directory.
 	rm -r kalite/packages/dist/man kolibri/dist/bin || true # remove the two folders introduced by pip 10
 	python setup.py sdist --formats=$(format) --static

diff --git a/circle.yml b/circle.yml
diff --git a/docs/Kolibri-launch.png b/docs/Kolibri-launch.png
diff --git a/docs/developer_docs/environment.rst b/docs/developer_docs/environment.rst
@@ -3,54 +3,105 @@
 Getting started
 ===============
 
-.. warning::  These directions may be out of date! This page needs to be consolidated with the `Getting Started page on our wiki <https://github.com/learningequality/ka-lite/wiki/Getting-started>`_.
+.. tip:: Find additional knowledge in `Getting Started on our Github Wiki <https://github.com/learningequality/ka-lite/wiki/Getting-started>`_.
 
-Recommended setup
-_________________
+KA Lite is discontinued and thus contains several legacy and end-of-life. It is recommended that you set up your development environment in a virtual machine, for instance using `Virtualbox <https://www.virtualbox.org/>`__.
 
+Ubuntu 18.04 LTS
+________________
 
-KA Lite is like a normal django project, if you have done Django before, you will recognize most of these steps.
+To avoid walking down an uncertain path when you set up this project, consider using Ubuntu 18.04 LTS in a virtual machine.
 
-#. Check out the project from our `github`_
-#. Create a virtual environment "kalite" that you will work in::
-
-     sudo pip install virtualenvwrapper
-     mkvirtualenv kalite
-     workon kalite
+These steps are largely based on the ``Dockerfile`` from the repository's root.
 
-#. Install kalite in your virtualenv in "editable" mode, meaning that the source is just linked::
-
-     cd path/to/repo
-     pip install -e .
+#. Install prerequisits. The development environment needs Python 2.7, pip and curl.
 
-#. Install additional development tools::
-     
-     pip install -r requirements_dev.txt
+   .. code-block:: bash
+
+      sudo apt install python2.7 curl python3-pip git make
 
-#. Build static assets such as javascript::
-
-     make assets
+#. Add the nodejs 6.x repo and install it.
+
+   .. code-block:: bash
+
+      # Get the key and add the repo
+      wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -
+      echo 'deb https://deb.nodesource.com/node_6.x bionic main' | sudo tee /etc/apt/sources.list.d/nodesource.list
+
+      # Overrule the newer version shipped by Ubuntu
+      printf "Package: *\nPin: origin deb.nodesource.com\nPin-Priority: 600" | sudo tee /etc/apt/preferences.d/nodejs
+
+      # Update and install
+      sudo apt update
+      sudo apt install nodejs
+
+#. Fork the project on `github`_, clone the git repository
+
+      git clone git@github.com:USERNAME/ka-lite.git
+      cd ka-lite
+
+#. Create a virtual environment and activate it:
+
+   .. code-block:: bash
+
+      pip3 install virtualenv
+      virtualenv -p python2.7 venv
+
+      # Activate the virtualenv - you need to do that everytime you open a new command line
+      source venv/bin/activate
+
+#. Install a development version of KA Lite inside the virtual environment:
+
+   .. code-block:: bash
+
+      pip install -e .
+
+#. Install development requirements:
+
+   .. code-block:: bash
+
+      # Development
+      pip install -r requirements_dev.txt
+      # Building docs
+      pip install -r requirements_sphinx.txt
+      # Test requirements
+      pip install -r requirements_test.txt
+
+#. Install JavaScript (nodejs) libraries and build them:
+
+   .. code-block:: bash
+
+      make assets
+
+#. You are now ready to run KA Lite. You can run a foreground version of the HTTP server like this:
+
+   .. code-block:: bash
+
+      kalite start --foreground
 
 #. Run the setup, which will bootstrap the database::
 
+   .. code-block:: bash
+
      kalite manage setup
 
 #. Run a development server and use development settings like this::
 
+   .. code-block:: bash
+
      kalite manage runserver --settings=kalite.project.settings.dev
-
 
-You can also change your ``~/.kalite/settings.py`` to point to ``kalite.project.settings.dev`` by default, then you do not have to specify `--settings=...` every time you run kalite.
+.. tip:: You can also change your ``~/.kalite/settings.py`` to point to ``kalite.project.settings.dev`` by default, then you do not have to specify `--settings=...` every time you run kalite.
 
-Now, every time you work on your development environment, just remember to switch on your virtual environment with ``workon kalite``.
+Every time you work on your development environment, remember to switch on your virtual environment with ``source venv/bin/activate``. You can use `virtualenvwrapper <https://virtualenvwrapper.readthedocs.io/en/latest/>`__ for more convenient ways of managing virtual envs.
 
 .. _github: https://github.com/learningequality/ka-lite
 
 
 Static vs. Dynamic version
 __________________________
 
-Apart from Python itself, KA Lite depends on a couple of python applications,
+Apart from Python itself, KA Lite depends on a couple of Python applications,
 mainly from the Django ecosystem. These dependencies can be installed in two ways:
 
 * **Dynamic**: Means dependencies are automatically installed through
@@ -79,10 +130,9 @@ Running tests
 _____________
 
 
-On Circle CI, we run Selenium 2.53.6 because it works in their environment. However,
-for more recent versions of Firefox, you need to upgrade Selenium::
+Ensure that you install the test requirements::
 
-    pip install selenium\<3.5 --upgrade
+    pip install -r requirements_test.txt
 
 To run all of the tests (this is slow)::
 

diff --git a/docs/developer_docs/index.rst b/docs/developer_docs/index.rst
@@ -1,6 +1,18 @@
 Developer Docs
 ==============
 
+.. warning:: 
+
+    **KA Lite is no longer under active development**
+
+    Our focus is now on our new learning platform, `Kolibri <https://learningequality.org/kolibri/>`__. If you’re just getting started, we highly recommend using Kolibri instead of KA Lite because it supports more content and will receive regular updates, and more ongoing support.   
+
+  .. figure:: ../Kolibri-launch.png
+      :align: center
+
+      New users can experience Khan Academy and much more with Kolibri! 
+
+
 Useful stuff our devs think that the rest of our devs ought to know about.
 
 .. toctree::

diff --git a/docs/faq.rst b/docs/faq.rst
@@ -1,6 +1,18 @@
 Frequently Asked Questions
 ==========================
 
+.. warning:: 
+
+    **KA Lite is no longer under active development**
+
+    Our focus is now on our new learning platform, `Kolibri <https://learningequality.org/kolibri/>`__. If you’re just getting started, we highly recommend using Kolibri instead of KA Lite because it supports more content and will receive regular updates, and more ongoing support.   
+
+  .. figure:: Kolibri-launch.png
+      :align: center
+
+      New users can experience Khan Academy and much more with Kolibri! 
+
+
 Something isn't working - does KA Lite have log files?
 ------------------------------------------------------
 
@@ -55,12 +67,6 @@ There are many ways to set an environment variable either temporarily or permane
 The change requires that you first stop the server, change the ``KALITE_HOME`` environment variable, and then copy the contents from the default ``.kalite`` directory to the new directory you just specified. When you start the server again, all your files should be seamlessly detected at that location.
 
 
-I would like to download the videos for KA Lite via BitTorrent, is this possible?
----------------------------------------------------------------------------------
-
-Yes! Please see the instructions for ":ref:`bulk-video-downloads`".
-
-
 .. _content_pack_retrieve_offline:
 
 How can I install a language pack without a reliable internet connection?

diff --git a/docs/index.rst b/docs/index.rst
@@ -9,6 +9,18 @@ KA Lite Documentation
 by `Learning Equality <https://learningequality.org/>`__
 
 
+.. warning:: 
+
+	**KA Lite is no longer under active development**
+
+	Our focus is now on our new learning platform, `Kolibri <https://learningequality.org/kolibri/>`__. If you’re just getting started, we highly recommend using Kolibri instead of KA Lite because it supports more content and will receive regular updates, and more ongoing support.	
+
+  .. figure:: Kolibri-launch.png
+      :align: center
+
+      New users can experience Khan Academy and much more with Kolibri!	
+
+
 Welcome to the KA Lite Documentation page! Here, you will find all the 
 information needed to set up the KA Lite software. Additionally, there's 
 information on how to manage KA Lite and how to perform role-specific 

diff --git a/docs/installguide/install_main.rst b/docs/installguide/install_main.rst
@@ -1,6 +1,17 @@
 KA Lite Installation Guides
 ===========================
 
+.. warning:: 
+
+	**KA Lite is no longer under active development**
+
+	Our focus is now on our new learning platform, `Kolibri <https://learningequality.org/kolibri/>`__. If you’re just getting started, we highly recommend using Kolibri instead of KA Lite because it supports more content and will receive regular updates, and more ongoing support.	
+
+  .. figure:: ../Kolibri-launch.png
+      :align: center
+
+      New users can experience Khan Academy and much more with Kolibri!	
+
 Installers for a number of platforms are available, each with separate
 installation steps. Click ahead for installation instructions, and if you're
 updating be sure to check out our release notes.