Switch to Github Actions and remove constraints on the cryptography and mysqlclient packages.

.github/workflows/ci.yml

@@ -0,0 +1,94 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches:
+    - '**'
+
+jobs:
+
+  run_tests:
+    name: Tests
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+        python-version: ['3.8']
+
+    env:
+      MYSQL_HOST: "127.0.0.1"  # For Django DATABASES setting.
+      VIRTUAL_ENV: ${{ github.workspace }}/venv
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+          MYSQL_DATABASE: "blockstore_db"
+          MYSQL_ROOT_PASSWORD: ""
+        ports:
+          - 3306:3306
+
+    defaults:
+      run:
+        working-directory: app
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0  # Need to fetch main branch for diff-cover.
+        path: app
+
+    - name: Setup python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Create Virtual Environment
+      run: python3.8 -m venv $VIRTUAL_ENV
+
+    - name: Install Dependencies
+      run: make requirements-test
+
+    - name: Run Tests
+      run: make test
+
+  run_quality:
+    name: Quality
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [ubuntu-20.04]
+        python-version: ['3.8']
+
+    env:
+      VIRTUAL_ENV: ${{ github.workspace }}/venv
+
+    defaults:
+      run:
+        working-directory: app
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        path: app
+
+    - name: Setup python
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Create Virtual Environment
+      run: python3.8 -m venv $VIRTUAL_ENV
+
+    - name: Install Dependencies
+      run: make requirements-test
+
+    - name: Run Quality
+      run: make quality

Dockerfile-3.8

@@ -2,12 +2,21 @@
 
 FROM ubuntu:20.04
 
-ENV VIRTUAL_ENV=/blockstore/venv
-
 RUN apt-get update
-RUN apt-get install libmysqlclient-dev libjpeg-dev libssl-dev libffi-dev python3 python3-venv python3-pip git -y
 
-RUN python3.8 -m venv $VIRTUAL_ENV
+# git is required by diff-cover
+# build-essential, libmysqlclient-dev and python3-dev are required by mysqlclient.
+RUN apt-get install -qy --no-install-recommends \
+ build-essential \
+ git \
+ libmysqlclient-dev \
+ make \
+ python3-dev \
+ python3-pip \
+ python3-venv
+
+ENV VIRTUAL_ENV=/blockstore/venv
+RUN python3 -m venv $VIRTUAL_ENV
 
 RUN echo 'cd /blockstore/app/' > ~/.bashrc.new
 RUN echo 'export PATH=$VIRTUAL_ENV/bin:$PATH' >> ~/.bashrc.new

Makefile

@@ -64,13 +64,15 @@ clean: ## Remove all generated files
 
 requirements: ## Install requirements for development
 	# We can't add this to requirements. It changes the way pip itself works.
-	${VENV_BIN}/pip install wheel
+	${VENV_BIN}/pip install -U pip wheel
 	${VENV_BIN}/pip install -r requirements/local.txt --exists-action w
 
 requirements-test: ## Install requirements for testing
+	${VENV_BIN}/pip install -U pip wheel
 	${VENV_BIN}/pip install -r requirements/test.txt --exists-action w
 
 production-requirements:
+	${VENV_BIN}/pip install -U pip wheel
 	${VENV_BIN}/pip install -r requirements/production.txt --exists-action w
 
 migrate: ## Apply database migrations

blockstore/urls.py

@@ -47,7 +47,7 @@
 urlpatterns += make_docs_urls(api_info)
 
 if settings.DEBUG:  # pragma: no cover
-    import debug_toolbar
+    import debug_toolbar  # pylint: disable=import-error
     urlpatterns.append(url(r'^__debug__/', include(debug_toolbar.urls)))
 
 if settings.DEBUG or os.environ['DJANGO_SETTINGS_MODULE'] == 'blockstore.settings.test':

docker-compose-3.8.yml

@@ -30,7 +30,6 @@ services:
 
 networks:
   devstack:
-    external:
       name: ${OPENEDX_PROJECT_NAME:-devstack}_default
 
 volumes:

requirements/base.txt

@@ -18,9 +18,8 @@ coreschema==0.0.4
     # via
     #   coreapi
     #   drf-yasg
-cryptography==3.3.2
+cryptography==3.4.8
     # via
-    #   -c requirements/constraints.txt
     #   pyjwt
     #   social-auth-core
 defusedxml==0.7.1
@@ -66,7 +65,7 @@ git+https://github.com/alanjds/drf-nested-routers.git@8686392f91b114e01f3781807d
     # via -r requirements/github.in
 drf-yasg==1.20.0
     # via edx-api-doc-tools
-edx-api-doc-tools==1.4.3
+edx-api-doc-tools==1.5.0
     # via -r requirements/base.in
 edx-auth-backends==4.0.0
     # via -r requirements/base.in
@@ -82,10 +81,8 @@ jinja2==3.0.1
     # via coreschema
 markupsafe==2.0.1
     # via jinja2
-mysqlclient==1.3.14
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/base.in
+mysqlclient==2.0.3
+    # via -r requirements/base.in
 oauthlib==3.1.1
     # via
     #   requests-oauthlib
@@ -123,23 +120,18 @@ ruamel.yaml.clib==0.2.6
     # via ruamel.yaml
 six==1.16.0
     # via
-    #   cryptography
     #   edx-auth-backends
     #   edx-django-release-util
     #   social-auth-app-django
 social-auth-app-django==4.0.0
-    # via
-    #   -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
-    #   edx-auth-backends
-social-auth-core==4.0.2
     # via
     #   -c requirements/common_constraints.txt
     #   edx-auth-backends
 social-auth-core==4.1.0
     # via
     #   edx-auth-backends
     #   social-auth-app-django
-sqlparse==0.4.1
+sqlparse==0.4.2
     # via
     #   -r requirements/base.in
     #   django

requirements/constraints.txt

@@ -23,14 +23,3 @@ django-cors-headers>=2.2.0,<2.3
 django-environ-2==2.1.0
 
 django-filter==2.1.0
-
-mysqlclient==1.3.14
-
-# We want >=3.3.2 to fix a moderate-severity security issue
-# reported here: https://github.com/pyca/cryptography/issues/5615.
-# However, we want <3.4 because the usage of Rust in cryptography>=3.4
-# causes the package to fail to install on the Alpine Linux image used for CI.
-# When someone has the time to switch that image to Ubuntu, then we can probably
-# remove this pin (as far as I can tell, there is no production reason not to
-# upgrade to the latest version of this package).
-cryptography>=3.3.2,<3.4

requirements/local.txt

@@ -66,9 +66,8 @@ coverage==5.5
     # via
     #   -r requirements/test.txt
     #   pytest-cov
-cryptography==3.3.2
+cryptography==3.4.8
     # via
-    #   -c requirements/constraints.txt
     #   -r requirements/test.txt
     #   pyjwt
     #   social-auth-core
@@ -131,7 +130,7 @@ drf-yasg==1.20.0
     # via
     #   -r requirements/test.txt
     #   edx-api-doc-tools
-edx-api-doc-tools==1.4.3
+edx-api-doc-tools==1.5.0
     # via -r requirements/test.txt
 edx-auth-backends==4.0.0
     # via -r requirements/test.txt
@@ -208,10 +207,8 @@ mypy-extensions==0.4.3
     # via
     #   -r requirements/test.txt
     #   mypy
-mysqlclient==1.3.14
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/test.txt
+mysqlclient==2.0.3
+    # via -r requirements/test.txt
 oauthlib==3.1.1
     # via
     #   -r requirements/test.txt
@@ -338,7 +335,6 @@ six==1.16.0
     # via
     #   -r requirements/docs.txt
     #   -r requirements/test.txt
-    #   cryptography
     #   django-dynamic-fixture
     #   edx-auth-backends
     #   edx-django-release-util
@@ -373,7 +369,7 @@ sphinxcontrib-websupport==1.2.4
     # via
     #   -r requirements/docs.txt
     #   sphinx
-sqlparse==0.4.1
+sqlparse==0.4.2
     # via
     #   -r requirements/test.txt
     #   django