Upgrade ScanCode-toolkit to latest 21.2.9 version #54

aboutcode-org · Feb 11, 2021 · 434f7f9 · 434f7f9
1 parent 0d339a7
commit 434f7f9
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 55 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,8 +29,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        # Python 3.9 not supported until next scancode-toolkit version
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8, 3.9]
 
     steps:
       - name: Checkout code
@@ -42,9 +41,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
-        run: |
-          make dev
-          make envfile
+        run: make venv upgrade-pip dev envfile
 
       - name: Validate code format
         run: make check

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,6 +3,8 @@
 
 ### v1.1.0 (unreleased)
 
+- Upgrade scancode-toolkit to version 21.2.9
+
 - Allow to start the pipeline run immediately on addition in the `add_pipeline` action
   of the Project API endpoint.
   https://github.com/nexB/scancode.io/issues/92

diff --git a/Makefile b/Makefile
@@ -41,12 +41,13 @@ else
 	SUDO_POSTGRES=
 endif
 
-conf:
-	@echo "-> Configure the Python venv and install dependencies"
+venv:
+	@echo "-> Configure the Python venv"
 	${PYTHON_EXE} -m venv .
+
+conf: venv
+	@echo "-> Install dependencies"
 	@${ACTIVATE} pip install -e .
-	# Workaround https://github.com/python/typing/issues/573#issuecomment-405986724
-	@${ACTIVATE} pip uninstall --yes typing
 
 dev: conf
 	@echo "-> Configure and install development dependencies"
@@ -58,6 +59,10 @@ envfile:
 	@mkdir -p $(shell dirname ${ENV_FILE}) && touch ${ENV_FILE}
 	@echo SECRET_KEY=\"${GET_SECRET_KEY}\" > ${ENV_FILE}
 
+upgrade-pip:
+	@echo "-> Upgrade pip to latest version"
+	@${ACTIVATE} pip install --upgrade pip
+
 install:
 	@echo "-> Install and configure the Python env with base dependencies, offline"
 	${PYTHON_EXE} -m venv .
@@ -130,4 +135,4 @@ docs:
 	rm -rf docs/_build/
 	sphinx-build docs/ docs/_build/
 
-.PHONY: conf dev envfile install check valid isort clean migrate postgres sqlite run test package bump docs
+.PHONY: venv conf dev envfile upgrade-pip install check valid isort clean migrate postgres sqlite run test package bump docs
diff --git a/etc/requirements/base.txt b/etc/requirements/base.txt
@@ -1,13 +1,13 @@
 # Configuration tools
-pip==20.3.3
-setuptools==51.1.2
+pip==21.0.1
+setuptools==53.0.0
 wheel==0.36.2
 
 # Django related
-Django==3.1.5
+Django==3.1.6
 django-environ==0.4.5
-django-crispy-forms==1.10.0
-pytz==2020.5
+django-crispy-forms==1.11.0
+pytz==2021.1
 django-filter==2.4.0
 djangorestframework==3.12.2
 
@@ -30,9 +30,8 @@ gunicorn==20.0.4
 container_inspector==3.1.2
 
 # ScanCode-toolkit
-scancode-toolkit[full]==3.2.3
-# Remove the following once the new scancode-toolkit is available
-commoncode==v20.10.20
+scancode-toolkit[full]==21.2.9
+extractcode-libarchive==3.5.1.210122
 
 # Utilities
 XlsxWriter==1.3.7