From: Vladimír Vondruš <mosra@centrum.cz>
Date: Mon, 3 Jan 2022 11:20:42 +0000 (+0100)
Subject: package/ci: now that attrs are needed always, handle them in one place.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=9bd482bac42abbe1582f701ba9e1bf34cdf2c6e1;p=blog.git

package/ci: now that attrs are needed always, handle them in one place.

It was done this way because Python doc generator wasn't working on
Python 3.5. But 3.5 is no longer tested for.
---

diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index b81c7f56..50a6b016 100644
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -45,9 +45,6 @@ commands:
 
   install-python-deps:
     parameters:
-      extra:
-        type: string
-        default: ""
       matplotlib-version:
         type: string
         default: ""
@@ -64,7 +61,7 @@ commands:
         # Docutils 0.18 drops some attribute that htmlsanity relies on, I need
         # to update the code first.
         command: |
-          pip install jinja2 docutils==0.17.1 pygments==2.9.0 pelican Pyphen Pillow coverage codecov qrcode matplotlib<< parameters.matplotlib-version >> << parameters.extra >>
+          pip install jinja2 docutils==0.17.1 pygments==2.9.0 pelican Pyphen Pillow coverage codecov qrcode matplotlib<< parameters.matplotlib-version >> attrs==19.3.0
     - run:
         name: Fix unheard-of cursed issues
         # otherwise i get Error: unsupported locale setting
@@ -186,7 +183,6 @@ jobs:
         extra: graphviz cmake ninja-build wget
     - install-python-deps:
         matplotlib-version: ==3.3.4
-        extra: attrs==19.3.0
     - checkout
     - test-theme
     - test-plugins
@@ -202,7 +198,6 @@ jobs:
         extra: graphviz cmake ninja-build wget
     - install-python-deps:
         matplotlib-version: ==3.3.4
-        extra: attrs==19.3.0
     - checkout
     - test-theme
     - test-plugins
@@ -218,7 +213,6 @@ jobs:
         extra: graphviz cmake ninja-build wget
     - install-python-deps:
         matplotlib-version: ==3.3.4
-        extra: attrs==19.3.0
     - checkout
     - test-theme
     - test-plugins
@@ -236,7 +230,6 @@ jobs:
         extra: graphviz cmake ninja-build wget
     - install-python-deps:
         matplotlib-version: ==3.3.4
-        extra: attrs==19.3.0
     - checkout
     - test-theme
     - test-plugins
@@ -254,7 +247,6 @@ jobs:
         extra: graphviz cmake ninja-build wget
     - install-python-deps:
         matplotlib-version: ==3.3.4
-        extra: attrs==19.3.0
     - checkout
     - test-theme
     - test-plugins