Split linting, and lint in container

Author: di

.github/workflows/ci.yml

@@ -10,9 +10,9 @@ jobs:
             needs-python: ${{ true }}
             needs-node: ${{ false }}
           - name: Lint
-            command: make lint BINDIR="$(dirname $(which python))"
+            command: bin/lint
             needs-python: ${{ true }}
-            needs-node: ${{ true }}
+            needs-node: ${{ false }}
           - name: Documentation
             command: make docs BINDIR="$(dirname $(which python))"
             needs-python: ${{ true }}
@@ -33,6 +33,10 @@ jobs:
             command: bin/static_tests
             needs-python: ${{ false }}
             needs-node: ${{ true }}
+          - name: Static Lint
+            command: bin/static_lint
+            needs-python: ${{ false }}
+            needs-node: ${{ true }}
           - name: Static Pipeline
             command: bin/static_pipeline
             needs-python: ${{ false }}

Dockerfile

@@ -111,7 +111,7 @@ RUN set -x \
             install --no-binary hiredis \
                     -r /tmp/requirements/deploy.txt \
                     -r /tmp/requirements/main.txt \
-                    $(if [ "$DEVEL" = "yes" ]; then echo '-r /tmp/requirements/tests.txt'; fi) \
+                    $(if [ "$DEVEL" = "yes" ]; then echo '-r /tmp/requirements/tests.txt -r /tmp/requirements/lint.txt'; fi) \
                     $(if [ "$THEME_REPO" != "" ]; then echo '-r /tmp/requirements/theme.txt'; fi) \
     && find /opt/warehouse -name '*.pyc' -delete
 

Makefile

@@ -105,22 +105,10 @@ reformat: .state/env/pyvenv.cfg
 	$(BINDIR)/isort *.py warehouse/ tests/
 	$(BINDIR)/black *.py warehouse/ tests/
 
-lint: .state/env/pyvenv.cfg
-	$(BINDIR)/flake8 .
-	$(BINDIR)/black --check *.py warehouse/ tests/
-	$(BINDIR)/isort --check *.py warehouse/ tests/
-	$(BINDIR)/doc8 --allow-long-titles README.rst CONTRIBUTING.rst docs/ --ignore-path docs/_build/
-	$(BINDIR)/curlylint ./warehouse/templates
-
-ifneq ($(filter false,$(TRAVIS) $(GITHUB_ACTIONS)),)
-	# We're either on Travis or GitHub Actions, so we can lint static files locally
-	./node_modules/.bin/eslint 'warehouse/static/js/**' '**.js' 'tests/frontend/**' --ignore-pattern 'warehouse/static/js/vendor/**'
-	./node_modules/.bin/sass-lint --verbose
-else
-	# We're not on Travis or GitHub Actions, so we should lint static files inside the static container
-	docker-compose run --rm static ./node_modules/.bin/eslint 'warehouse/static/js/**' '**.js' 'tests/frontend/**' --ignore-pattern 'warehouse/static/js/vendor/**'
-	docker-compose run --rm static ./node_modules/.bin/sass-lint --verbose
-endif
+lint: .state/docker-build
+	docker-compose run --rm web env -i ENCODING="C.UTF-8" \
+								  PATH="/opt/warehouse/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" \
+								  bin/lint && bin/static_lint
 
 docs: .state/env/pyvenv.cfg
 	$(MAKE) -C docs/ doctest SPHINXOPTS="-W" SPHINXBUILD="$(BINDIR)/sphinx-build"

bin/lint

@@ -0,0 +1,20 @@
+#!/bin/bash
+set -e
+
+# Click requires us to ensure we have a well configured environment to run
+# our click commands. So we'll set our environment to ensure our locale is
+# correct.
+export LC_ALL="${ENCODING:-en_US.UTF-8}"
+export LANG="${ENCODING:-en_US.UTF-8}"
+
+COMMAND_ARGS=$@
+
+# Print all the followng commands
+set -x
+
+# Actually run our tests.
+python -m flake8 .
+python -m black --check *.py warehouse/ tests/
+python -m isort --check *.py warehouse/ tests/
+python -m doc8 --allow-long-titles README.rst CONTRIBUTING.rst docs/ --ignore-path docs/_build/
+python -m curlylint ./warehouse/templates

bin/static_lint

@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+set -x
+
+# Click requires us to ensure we have a well configured environment to run
+# our click commands. So we'll set our environment to ensure our locale is
+# correct.
+export LC_ALL="${ENCODING:-en_US.UTF-8}"
+export LANG="${ENCODING:-en_US.UTF-8}"
+
+# Actually run our tests.
+./node_modules/.bin/eslint 'warehouse/static/js/**' '**.js' 'tests/frontend/**' --ignore-pattern 'warehouse/static/js/vendor/**'
+./node_modules/.bin/sass-lint --verbose

docker-compose.yml

@@ -85,6 +85,7 @@ services:
       - ./htmlcov:/opt/warehouse/src/htmlcov:z
       - .coveragerc:/opt/warehouse/src/.coveragerc:z
       - packages:/var/opt/warehouse/packages
+      - ./bin:/opt/warehouse/src/bin:z
     ports:
       - "80:8000"
 

requirements/dev.txt

@@ -2,3 +2,5 @@ hupper>=1.9
 pip-api
 pip-tools>=1.0
 pyramid_debugtoolbar>=2.5
+-r tests.in
+-r lint.in