dickmao
/
nnreddit
Protected
1
1
1
Fork 0
Code Issues 10 Pull Requests 1 Packages Projects Releases Wiki Activity

Bump urllib3 from 1.25.8 to 1.26.5 #89

Open
dependabot[bot] wants to merge 0 commits from dependabot/pip/urllib3-1.26.5 into master
pull from: dependabot/pip/urllib3-1.26.5
merge into: dickmao:master
Conversation 0 Commits - Files Changed 11
11 changed files with 50 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/test.yml vendored
View File

@ -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
@ -63,7 +63,6 @@ jobs:
run: |
sudo apt-get -yq update
DEBIAN_FRONTEND=noninteractive sudo apt-get -yq install gnutls-bin sharutils dirmngr libreadline-dev libcurl4-openssl-dev virtualenv
DEBIAN_FRONTEND=noninteractive sudo apt-get -yq install python3.8-minimal python3.8-distutils python3.8-venv
- uses: actions/cache@v2
id: cache-cask-packages

2
.gitignore vendored
View File

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

19
Makefile
View File

@ -1,22 +1,16 @@
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
ifeq ($(shell expr $$($(PYTHON) --version 2>&1 | cut -d'.' -f2) \< 11),0)
$(error Set PYTHON to an older python3)
endif
SRC=$(shell cask files)
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)
export TEST_PYTHON ?= python
ifeq ($(shell expr $$($(TEST_PYTHON) --version 2>&1 | cut -d'.' -f2) \< 9),0)
$(error Set TEST_PYTHON to an older python3)
endif
.DEFAULT_GOAL := test-compile
@ -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
@ -166,8 +161,6 @@ test: test-compile test-unit test-int
.PHONY: test-int
test-int:
@>/dev/null expr $$($(TEST_PYTHON) --version 2>&1 | cut -d'.' -f2) \< 9 || { echo "need python less than 3.9" ; exit -1; }
rm -rf venv-nnreddit-test
$(TEST_PYTHON) -m venv venv-nnreddit-test
( \
source venv-nnreddit-test/bin/activate; \

22
README.in.rst
View File

@ -24,25 +24,13 @@
.. |---| unicode:: U+2014 .. em dash, trimming surrounding whitespace
:trim:
Deprecated for emacs-subreddit
==============================
At some point, python versions after 3.8 refused user invocations of
``pip install --user`` on various Linux distributions. As described below
you can still run ``make install`` with ``PYTHON=python3.8``, but for the ten
guys who reddit just for ``r/emacs``, skip the disaster of Gnus
altogether, and try:
https://github.com/dickmao/emacs-subreddit.git
Install
=======
Alas, you'll need Cask_. Then,
**As of 06 July 2021, authentication behavior at Reddit changed** such that nnreddit versions previous to 0.2.0 no longer work. Delete ``$HOME/.local/share/nnreddit/refresh-token``, and install the latest nnreddit.
::
**As of 24 May 2020, to stay apace with the** PRAW_ **backend, nnreddit no longer supports python2.** If your system keeps python 3.x in a separate alias such as ``python3``, you should ``M-x customize-variable RET nnreddit-python-command`` to it.
git clone https://github.com/dickmao/nnreddit.git
PYTHON=python3.8 make install
We are trying to push ELPASO_ as the preferred package installer. Alternatively, directly clone this repo and ``make install``.
Also see Troubleshooting_.
@ -88,6 +76,10 @@ You can subscribe to it via the ``u`` keybinding from the ``*Group*`` buffer [1]
Gnus beginners may find the interface bewildering. In particular, subreddits with no unread articles do not display. Use ``L`` to bring them out of hiding.
Troubleshooting
===============
Clone this repo. Then install Cask_. Then try ``make test-run-interactive``.
|
.. [1] Gnus users are familiar with the tragedy of ``u`` doing double duty as subscriber and unsubscriber. ``u`` is really a toggle even though the attached command is ``gnus-group-unsubscribe-current-group`` |---| if that doesn't trigger your UX sensibility, then never mind I mentioned it.

22
README.rst
View File

@ -24,25 +24,13 @@ A Gnus backend for Reddit.
.. |---| unicode:: U+2014 .. em dash, trimming surrounding whitespace
:trim:
Deprecated for emacs-subreddit
==============================
At some point, python versions after 3.8 refused user invocations of
``pip install --user`` on various Linux distributions. As described below
you can still run ``make install`` with ``PYTHON=python3.8``, but for the ten
guys who reddit just for ``r/emacs``, skip the disaster of Gnus
altogether, and try:
https://github.com/dickmao/emacs-subreddit.git
Install
=======
Alas, you'll need Cask_. Then,
**As of 06 July 2021, authentication behavior at Reddit changed** such that nnreddit versions previous to 0.2.0 no longer work. Delete ``$HOME/.local/share/nnreddit/refresh-token``, and install the latest nnreddit.
::
**As of 24 May 2020, to stay apace with the** PRAW_ **backend, nnreddit no longer supports python2.** If your system keeps python 3.x in a separate alias such as ``python3``, you should ``M-x customize-variable RET nnreddit-python-command`` to it.
git clone https://github.com/dickmao/nnreddit.git
PYTHON=python3.8 make install
We are trying to push ELPASO_ as the preferred package installer. Alternatively, directly clone this repo and ``make install``.
Also see Troubleshooting_.
@ -88,6 +76,10 @@ You can subscribe to it via the ``u`` keybinding from the ``*Group*`` buffer [1]
Gnus beginners may find the interface bewildering. In particular, subreddits with no unread articles do not display. Use ``L`` to bring them out of hiding.
Troubleshooting
===============
Clone this repo. Then install Cask_. Then try ``make test-run-interactive``.
|
.. [1] Gnus users are familiar with the tragedy of ``u`` doing double duty as subscriber and unsubscriber. ``u`` is really a toggle even though the attached command is ``gnus-group-unsubscribe-current-group`` |---| if that doesn't trigger your UX sensibility, then never mind I mentioned it.

3
features/step-definitions/nnreddit-steps.el
View File

@ -103,11 +103,12 @@
(lambda (negate bogey)
(nnreddit-test-wait-for
(lambda ()
(let ((says (s-contains? (s-replace "\\n" "\n" bogey) (buffer-string))))
(let* ((says (s-contains? (s-replace "\\n" "\n" bogey) (buffer-string))))
(revert-buffer :ignore-auto :noconfirm)
(if negate (not says) says)))
nil 5000 1000)))
;; (When "^I scuzz \"\\(.+\\)\"$"
;; (lambda (buffer)
;; (let ((v (vconcat [?\C-x ?b] (string-to-vector buffer))))

35
lisp/nnreddit.el
View File

@ -110,11 +110,15 @@ normal hashtables."
'puthash)
,string ,value ,hashtable))
(defcustom nnreddit-python-command "python3.8"
(defcustom nnreddit-python-command (if (equal system-type 'windows-nt)
(or (executable-find "py")
(executable-find "pythonw")
"python")
"python")
"Python executable name."
:type (append '(choice)
(let (result)
(dolist (py '("python3.7" "python3.8" "python3.9" "python3.10")
(dolist (py '("python" "python3" "pythonw" "py")
result)
(setq result (append result `((const :tag ,py ,py))))))
'((string :tag "Other")))
@ -505,9 +509,8 @@ So we cannot use `nnreddit--gate'."
"Disambiguate GROUP if it's empty and execute BODY."
(declare (debug (form &rest form))
(indent 1))
`(when-let ((group (or ,group (gnus-group-real-name gnus-newsgroup-name)))
(gnus-newsgroup-name (unless (zerop (length group))
(gnus-group-full-name group "nnreddit:"))))
`(let* ((group (or ,group (gnus-group-real-name gnus-newsgroup-name)))
(gnus-newsgroup-name (gnus-group-full-name group "nnreddit:")))
,@body))
(defun nnreddit--get-header (article-number &optional group)
@ -932,13 +935,11 @@ Used in the interleaving of submissions and comments."
(deffoo nnreddit-request-list (&optional server)
(nnreddit--normalize-server)
(with-current-buffer nntp-server-buffer
(let ((groups (delq
nil
(or nnreddit--groups
(setq nnreddit--groups
(append (nnreddit-rpc-call server nil "user_subreddits")
(nnreddit--test-supports-inbox
(list (nnreddit--inbox-realname))))))))
(let ((groups (or nnreddit--groups
(setq nnreddit--groups
(append (nnreddit-rpc-call server nil "user_subreddits")
(nnreddit--test-supports-inbox
(list (nnreddit--inbox-realname)))))))
(newsrc (cl-mapcan (lambda (info)
(when (and (equal "nnreddit:" (gnus-info-method info))
(<= (gnus-info-level info)
@ -1023,10 +1024,9 @@ relics of the 1990s."
nnreddit-el-dir)))
(python-shell-extra-pythonpaths (list nnreddit-py-dir))
(process-environment
(cons (concat "PATH=" (getenv "PATH"))
(funcall (if (fboundp 'python-shell--calculate-process-environment)
(symbol-function 'python-shell--calculate-process-environment)
(symbol-function 'python-shell-calculate-process-environment)))))
(funcall (if (fboundp 'python-shell--calculate-process-environment)
(symbol-function 'python-shell--calculate-process-environment)
(symbol-function 'python-shell-calculate-process-environment))))
(python-executable (if nnreddit-venv
(format "%s/bin/python" nnreddit-venv)
(executable-find nnreddit-python-command)))
@ -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

6
nnreddit/authenticated_reddit.py
View File

@ -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) ]

2
requirements-dev.txt
View File

@ -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

1
setup.py
View File

@ -29,6 +29,5 @@ setup(
"jsonrpyc>=1.1.0",
"rtv>=1.26.0",
"praw>=7.3.0",
"urllib3<=2.2.3",
],
)

2
tests/nnreddit-test.el
View File

@ -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)