BB-2659 juniper xblock html and xblock completable (#4)

* Update requirements

* Fix some pydocstyle errors

* Comment on the requirement for Python 3.5

* Update the CircleCI configuration to use Python 3.5

* Install requirements in correct order

* Update versions

.circleci/config.yml

@@ -1,7 +1,7 @@
 defaults: &DEFAULT
   working_directory: /home/circleci/xblock-html
   docker:
-    - image: circleci/python:2.7
+    - image: circleci/python:3.5
 
 
 version: 2

Makefile

@@ -25,12 +25,14 @@ clean: ## Remove generated byte code, coverage reports, and build artifacts
 selfcheck: ## Check that the Makefile is well-formed
 	@echo "The Makefile is well-formed."
 
-test_requirements: ## Install requirements needed by test environment
+base_requirements: ## Install base requirements needed at all times
+	pip install -q -r requirements/base.txt --exists-action w
+
+test_requirements: base_requirements ## Install requirements needed by test environment
 	pip install -q -r requirements/quality.txt --exists-action w
 	pip install -q -r requirements/test.txt --exists-action w
 
-requirements: test_requirements ## Installs all requirements needed by developmenent and test environments
-	pip install -q -r requirements/base.txt --exists-action w
+requirements: base_requirements test_requirements ## Installs all requirements needed by developmenent and test environments
 	pip install -e .
 	@echo "Finished installing requirements."
 

README.md

@@ -18,6 +18,8 @@ pip install https://github.com/open-craft/xblock-html-completable
 ```
 You may specify the `-e` flag if you intend to develop on the repo.
 
+Note that as of version 1.0.0, Python 2.7 is no longer supported. The current minimum Python version is 3.5.
+
 To enable this block type, add `completable_html5` to course's advanced module list.
 
 ## Development

completable_html_xblock/__init__.py

@@ -1,4 +1,4 @@
-"""Completable HTML XBlock module"""
+"""Completable HTML XBlock module."""
 from __future__ import absolute_import
 
 from .html import CompletableHTML5XBlock

requirements.txt

@@ -0,0 +1 @@
+-r requirements/base.txt

requirements/base.txt

@@ -1,8 +1,9 @@
 # Requirements for app run
 
-git+https://github.com/edx/[email protected]#egg=xblock-utils==1.1.1
-django-statici18n==1.8.0
-edx-i18n-tools==0.4.7
-Mako==1.0.7
-bleach==2.1.4
-html-xblock~=0.1.1
+git+https://github.com/edx/[email protected]#egg=xblock-utils==2.1.1
+django-statici18n==1.9.0
+edx-i18n-tools==0.5.3
+Mako==1.1.3
+bleach==3.1.5
+html-xblock~=1.0.0
+django~=2.2

requirements/quality.txt

@@ -1,9 +1,9 @@
 # Requirements for code quality checks
 
-isort==4.3.4
-astroid==1.5.2
-pycodestyle==2.4.0
-pydocstyle==2.1.1
-pylint==1.7.1
-caniusepython3==7.0.0
-edx_lint==0.5.5
+isort==4.3.21
+astroid==2.3.3
+pycodestyle==2.6.0
+pydocstyle==5.0.2
+pylint==2.4.2
+caniusepython3==7.2.0
+edx-lint==1.4.1

requirements/test.txt

@@ -1,14 +1,14 @@
 # Requirements for test runs
 
 codecov==2.0.15
-diff-cover==1.0.4
+diff-cover==2.6.1
 django-nose==1.4.4
-lazy==1.1
-pytest-cov==2.6.0
-tox==3.1.3
-tox-battery==0.5.1
+lazy==1.4
+pytest-cov==2.8.1
+tox==3.15.0
+tox-battery==0.6.0
 mock==3.0.5
 
 # Github requirements
-git+https://github.com/edx/django-pyfs.git@1.0.3#egg=django-pyfs==1.0.3
-git+https://github.com/edx/xblock-sdk.git#egg=xblock-sdk
+git+https://github.com/edx/django-pyfs.git@2.1#egg=django-pyfs==2.1
+xblock-sdk

setup.py

@@ -23,7 +23,7 @@ def package_data(pkg, roots):
 
 setup(
     name='completable-html-xblock',
-    version='0.1.2',
+    version='1.0.0',
     description='HTML XBlock will help creating and using a secure, easy-to-use and completable HTML blocks',
     license='AGPL v3',
     packages=[
@@ -32,7 +32,7 @@ def package_data(pkg, roots):
     install_requires=[
         'XBlock',
         'bleach',
-        'html-xblock~=0.1.1',
+        'html-xblock~=1.0.0',
     ],
     entry_points={
         'xblock.v1': [

tests/__init__.py

@@ -1 +1 @@
-"""Tests module"""
+"""Tests module."""