From 5f5b10c5b2da5d8f8daecd0b1e3ef603651d7641 Mon Sep 17 00:00:00 2001
From: Greg Lindahl <lindahl@pbm.com>
Date: Thu, 29 Aug 2024 21:08:12 +0000
Subject: [PATCH] fix: brotli install, doc, and test (#179)

---
 .github/workflows/ci.yaml | 16 ++++++++++++++--
 CHANGELIST.rst            |  2 ++
 README.rst                |  6 +++---
 setup.py                  |  3 +++
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a5d654b7..a734474a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,6 +1,10 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - main
+  pull_request:
 
 jobs:
   unit-tests:
@@ -13,6 +17,10 @@ jobs:
         os: [ubuntu-latest]
         EXTRA: [false]  # used to force includes to get included
         include:
+          - python-version: '3.12'
+            os: ubuntu-latest
+            EXTRA: true
+            NOTALL: true
           - python-version: '3.11'
             os: macos-latest
             EXTRA: true
@@ -40,7 +48,11 @@ jobs:
         run: |
           pip install setuptools
 
-      - name: Install warcio
+      - name: Install warcio ALL
+        if: ${{ ! matrix.NOTALL }}
+        run: pip install .[brotli,testing]
+      - name: Install warcio NOTALL
+        if: ${{ matrix.NOTALL }}
         run: pip install .[testing]
 
       - name: Run tests
diff --git a/CHANGELIST.rst b/CHANGELIST.rst
index 731289b3..c5083161 100644
--- a/CHANGELIST.rst
+++ b/CHANGELIST.rst
@@ -3,6 +3,8 @@ Unreleased
 
 - Add support for Python 3.12 by adjusting `urllib3` dependency to `>=1.26.4,<1.26.16`
 
+- Make brotli support easier to install
+
 
 1.7.4
 ~~~~~
diff --git a/README.rst b/README.rst
index be7ccbbb..240ab9a2 100644
--- a/README.rst
+++ b/README.rst
@@ -11,13 +11,13 @@ Background
 
 This library provides a fast, standalone way to read and write `WARC
 Format <https://en.wikipedia.org/wiki/Web_ARChive>`__ commonly used in
-web archives. Supports Python 2.7+ and Python 3.4+ (using
-`six <https://pythonhosted.org/six/>`__, the only external dependency)
+web archives. Python 3.7+ (minimally only needing
+`six <https://pythonhosted.org/six/>`__ as an external dependency)
 
 warcio supports reading and writing of WARC files compliant with both the `WARC 1.0 <http://bibnum.bnf.fr/WARC/WARC_ISO_28500_version1_latestdraft.pdf>`__
 and `WARC 1.1 <http://bibnum.bnf.fr/WARC/WARC_ISO_28500_version1-1_latestdraft.pdf>`__ ISO standards.
 
-Install with: ``pip install warcio``
+Install with: ``pip install warcio`` (or ``pip install warcio[all]`` to get optional features)
 
 This library is a spin-off of the WARC reading and writing component of
 the `pywb <https://github.com/webrecorder/pywb>`__ high-fidelity replay
diff --git a/setup.py b/setup.py
index db123e85..e1d8fe4f 100755
--- a/setup.py
+++ b/setup.py
@@ -37,6 +37,9 @@
             'requests',
             'wsgiprox',
             'hookdns',
+        ],
+        'all': [
+            'brotlipy',
         ]
     },
     classifiers=[