.github/workflows/test.yml

@@ -18,12 +18,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        emacs_version: [27.2, 28.2, 29.3]
-        python_version: [3.8]
+        emacs_version: [25.3, 26.3, 27.2, 28.2]
+        python_version: [3.7]
         include:
-          - os: macos-12
-            emacs_version: 29.3
-            python_version: 3.8
+          - os: macos-latest
+            emacs_version: 28.1
+            python_version: 3.7
 
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -1,5 +1,3 @@
-build
-venv-nnreddit-test
 .ecukes*
 .cask
 .newsrc*

Makefile

@@ -1,9 +1,6 @@
 SHELL := /bin/bash
 EMACS ?= $(shell which emacs)
 export PYTHON ?= python
-ifeq ($(shell command -v $(PYTHON) 2>/dev/null),)
-$(error $(PYTHON) not found)
-endif
 ifeq ($(shell expr $$($(PYTHON) --version 2>&1 | cut -d' ' -f2) \< 3),1)
 $(error Set PYTHON to python3)
 endif
@@ -12,9 +9,6 @@ PKBUILD=2.3
 ELCFILES = $(SRC:.el=.elc)
 CASK_DIR := $(shell EMACS=$(EMACS) cask package-directory || exit 1)
 export TEST_PYTHON ?= python
-ifeq ($(shell command -v $(TEST_PYTHON) 2>/dev/null),)
-$(error $(TEST_PYTHON) not found)
-endif
 ifeq ($(shell expr $$($(TEST_PYTHON) --version 2>&1 | cut -d'.' -f2) \< 9),0)
 $(error Set TEST_PYTHON to an older python3)
 endif
@@ -49,6 +43,7 @@ clean:
 	rm -f tests/log/*
 	rm -rf tests/test-install
 
+
 .PHONY: pylint
 ifeq ($(shell expr $$($(PYTHON) --version 2>&1 | cut -d'.' -f2) \> 9),1)
 pylint:
@@ -62,7 +57,7 @@ endif
 .PHONY: test-compile
 test-compile: cask autoloads pylint
 	sh -e tools/package-lint.sh lisp/nnreddit.el
-	! (cask eval "(let ((byte-compile-error-on-warn t) (bytecomp--inhibit-lexical-cookie-warning t) (byte-compile--suppressed-warnings (quote ((obsolete define-package))))) (cask-cli/build))" 2>&1 | egrep -a "(Warning|Error):")
+	! (cask eval "(let ((byte-compile-error-on-warn t)) (cask-cli/build))" 2>&1 | egrep -a "(Warning|Error):")
 	cask clean-elc
 
 define SET_GITHUB_ACTOR =
@@ -152,7 +147,7 @@ test-run: cask autoloads
 	  --eval "(cl-assert nnreddit-processes)"
 
 .PHONY: test-run-interactive
-test-run-interactive: cask autoloads
+test-run-interactive:
 	cask emacs -Q \
 	  $(TESTRUN) \
 	  -f gnus

lisp/nnreddit.el

@@ -1482,8 +1482,7 @@ Written by John Wiegley (https://github.com/jwiegley/dot-emacs).")
           (let* ((dont-ask (lambda (prompt)
                              (when (cl-search "mpty article" prompt) t)))
                  (link-p (message-fetch-field "Link"))
-                 (message-shoot-gnksa-feet (if link-p t message-shoot-gnksa-feet))
-		 (message-inhibit-body-encoding t))
+                 (message-shoot-gnksa-feet (if link-p t message-shoot-gnksa-feet)))
             (unwind-protect
                 (progn
                   (when link-p

nnreddit/authenticated_reddit.py

@@ -176,9 +176,11 @@ class AuthenticatedReddit(Reddit):
         recording_end(cassette)
         return True
 
-    def random_subreddit(self, *, nsfw: bool=False):
-        above = super().random_subreddit(nsfw=nsfw)
+    # pragma pylint: disable=arguments-differ
+    def random_subreddit(self, nsfw=False):
+        above = super().random_subreddit(nsfw)
         return above.display_name
+    # pragma pylint: enable=arguments-differ
 
     def search(self, query, **generator_kwargs):
         return [ x.display_name for x in self.subreddits.search(query, **generator_kwargs) ]

requirements-dev.txt

@@ -5,4 +5,4 @@ vcrpy==2.0.1
 betamax==0.8.1
 betamax-serializers==0.2.0
 pytest==4.5.0
-urllib3==1.26.19
+urllib3==1.26.5

tests/nnreddit-test.el

@@ -50,6 +50,6 @@
            (cl-letf (((symbol-function 'yes-or-no-p) (lambda (&rest args) t))
                      ((symbol-function 'y-or-n-p) (lambda (&rest args) t)))
              (apply f args)))))
-      '(message-cancel-news message-send-news find-file-noselect))
+      '(message-cancel-news message-send-news))
 
 (provide 'nnreddit-test)