chore: Post Django32 cleanup

openedx · Jan 28, 2022 · 8e4c08e · 8e4c08e
1 parent ddbcf75
commit 8e4c08e
Show file tree

Hide file tree

Showing 14 changed files with 239 additions and 235 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,46 +2,46 @@ name: Python CI
 on:
   push:
     branches:
-      - master
+    - master
   pull_request:
     branches:
-      - '**'
+    - '**'
 jobs:
-  python-tests:
+  run_tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        os: [ ubuntu-20.04 ]
-        python-version: [ '3.8' ]
-        toxenv: [ django22, django30, django31, django32 ]
+        os: [ubuntu-20.04]
+        python-version: ['3.8']
+        toxenv: [django32, django40]
     steps:
-      - uses: actions/checkout@v2
+    - uses: actions/checkout@v2
 
-      - name: Python setup
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ matrix.python-version }}
+    - name: Python setup
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
 
-      - name: Set up test environment
-        run: |
-          sudo apt-get install xvfb
-          wget https://github.com/mozilla/geckodriver/releases/download/v0.15.0/geckodriver-v0.15.0-linux64.tar.gz
-          mkdir geckodriver
-          tar -xzf geckodriver-v0.15.0-linux64.tar.gz -C geckodriver
-          export PATH=$PATH:$(pwd)/geckodriver
-          export BOTO_CONFIG=/dev/null
+    - name: Set up test environment
+      run: |
+        sudo apt-get install xvfb
+        wget https://github.com/mozilla/geckodriver/releases/download/v0.15.0/geckodriver-v0.15.0-linux64.tar.gz
+        mkdir geckodriver
+        tar -xzf geckodriver-v0.15.0-linux64.tar.gz -C geckodriver
+        export PATH=$PATH:$(pwd)/geckodriver
+        export BOTO_CONFIG=/dev/null
 
-      - name: Install Requirements
-        run: |
-          pip install -r requirements/pip.txt
-          pip install -r requirements/ci.txt
+    - name: Install Requirements
+      run: |
+        pip install -r requirements/pip.txt
+        pip install -r requirements/ci.txt
 
-      - name: Run Tests
-        run: xvfb-run --server-args=-ac -- tox -e ${{ matrix.toxenv }}
+    - name: Run Tests
+      run: xvfb-run --server-args=-ac -- tox -e ${{ matrix.toxenv }}
 
-      - name: Upload coverage to CodeCov
-        if: matrix.python-version == '3.8' && matrix.toxenv == 'django32'
-        uses: codecov/codecov-action@v1
-        with:
-          file: ./coverage.xml
-          fail_ci_if_error: true
+    - name: Upload coverage to CodeCov
+      if: matrix.python-version == '3.8' && matrix.toxenv == 'django32'
+      uses: codecov/codecov-action@v1
+      with:
+        file: ./coverage.xml
+        fail_ci_if_error: true
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,13 @@ Change history for XBlock SDK
 
 These are notable changes in XBlock.
 
+0.5.0
+-----
+* Removed Django22, 30 and 31 support
+* Added Django40 support
+* Renamed CI job so that our modernizers work fine
+* Code changes related to things removed in Django40
+
 0.4.0
 -----
 * Added support for Django 3.0, Django 3.1 and Django 3.2 tests

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,3 +5,4 @@ include README.rst
 include requirements/base.in
 include requirements/test.in
 include requirements/test.txt
+include requirements/constraints.txt
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -6,36 +6,38 @@
 #
 appdirs==1.4.4
     # via fs
-arrow==1.2.0
+arrow==1.2.1
     # via jinja2-time
+asgiref==3.5.0
+    # via django
 binaryornot==0.4.4
     # via cookiecutter
 boto==2.49.0
     # via -r requirements/base.in
-boto3==1.18.54
+boto3==1.20.41
     # via fs-s3fs
-botocore==1.21.54
+botocore==1.23.41
     # via
     #   boto3
     #   s3transfer
-certifi==2021.5.30
+certifi==2021.10.8
     # via requests
 chardet==4.0.0
     # via binaryornot
-charset-normalizer==2.0.6
+charset-normalizer==2.0.10
     # via requests
-click==8.0.1
+click==8.0.3
     # via cookiecutter
 cookiecutter==1.7.3
     # via -r requirements/base.in
-django==2.2.24
+django==3.2.11
     # via
     #   -c requirements/common_constraints.txt
     #   -r requirements/base.in
     #   django-pyfs
-django-pyfs==3.1.0
+django-pyfs==3.2.0
     # via -r requirements/base.in
-fs==2.4.13
+fs==2.4.14
     # via
     #   django-pyfs
     #   fs-s3fs
@@ -44,9 +46,9 @@ fs-s3fs==1.1.1
     # via
     #   -r requirements/base.in
     #   django-pyfs
-idna==3.2
+idna==3.3
     # via requests
-jinja2==3.0.2
+jinja2==3.0.3
     # via
     #   cookiecutter
     #   jinja2-time
@@ -58,7 +60,7 @@ jmespath==0.10.0
     #   botocore
 lazy==1.4
     # via -r requirements/base.in
-lxml==4.6.3
+lxml==4.7.1
     # via
     #   -r requirements/base.in
     #   xblock
@@ -82,15 +84,15 @@ pytz==2021.3
     #   django
     #   fs
     #   xblock
-pyyaml==5.4.1
+pyyaml==6.0
     # via xblock
-requests==2.26.0
+requests==2.27.1
     # via
     #   -r requirements/base.in
     #   cookiecutter
 s3transfer==0.5.0
     # via boto3
-simplejson==3.17.5
+simplejson==3.17.6
     # via -r requirements/base.in
 six==1.16.0
     # via
@@ -102,11 +104,11 @@ sqlparse==0.4.2
     # via django
 text-unidecode==1.3
     # via python-slugify
-urllib3==1.26.7
+urllib3==1.26.8
     # via
     #   botocore
     #   requests
-web-fragments==1.1.0
+web-fragments==2.0.0
     # via
     #   -r requirements/base.in
     #   xblock

diff --git a/requirements/ci.txt b/requirements/ci.txt
@@ -4,49 +4,47 @@
 #
 #    make upgrade
 #
-backports.entry-points-selectable==1.1.0
-    # via virtualenv
-certifi==2021.5.30
+certifi==2021.10.8
     # via requests
-charset-normalizer==2.0.6
+charset-normalizer==2.0.10
     # via requests
 codecov==2.1.12
     # via -r requirements/ci.in
-coverage==6.0
+coverage==6.2
     # via codecov
-distlib==0.3.3
+distlib==0.3.4
     # via virtualenv
-filelock==3.3.0
+filelock==3.4.2
     # via
     #   tox
     #   virtualenv
-idna==3.2
+idna==3.3
     # via requests
-packaging==21.0
+packaging==21.3
     # via tox
-platformdirs==2.4.0
+platformdirs==2.4.1
     # via virtualenv
 pluggy==1.0.0
     # via tox
-py==1.10.0
+py==1.11.0
     # via tox
-pyparsing==2.4.7
+pyparsing==3.0.7
     # via packaging
-requests==2.26.0
+requests==2.27.1
     # via codecov
 six==1.16.0
     # via
     #   tox
     #   virtualenv
 toml==0.10.2
     # via tox
-tox==3.24.4
+tox==3.24.5
     # via
     #   -r requirements/ci.in
     #   tox-battery
 tox-battery==0.6.1
     # via -r requirements/ci.in
-urllib3==1.26.7
+urllib3==1.26.8
     # via requests
-virtualenv==20.8.1
+virtualenv==20.13.0
     # via tox
diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
@@ -13,7 +13,7 @@
 
 
 # using LTS django version
-Django<2.3
+Django<4.0
 
 # latest version is causing e2e failures in edx-platform.
 # See pyjwt[crypto]<2.0.0 comment.