Skip to content

Commit

Permalink
more warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
nabobalis committed Jul 9, 2022
1 parent f8e83d0 commit 4fe4966
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 48 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ rebuild:
cd docs; watchmedo shell-command --patterns='*.rst' --command='ablog build' --recursive

test:
set -e; cd docs; ablog build -T; git clean -xfd; cd ..
set -e; cd docs; ablog build -T -W; git clean -xfd; cd ..

test1:
set -e; cd docs; ablog build -T -b json; git clean -xfd; cd ..
set -e; cd docs; ablog build -T -W -b json; git clean -xfd; cd ..

test2:
set -e; cd docs; ablog build -T -b pickle; git clean -xfd; cd ..
set -e; cd docs; ablog build -T -W -b pickle; git clean -xfd; cd ..

test3:
set -e; mkdir -p test; cd test; printf "\nABlog\nABlog Team\nhttps://ablog.readthedocs.org" | ablog start; ablog build; cd ..; rm -rf test
set -e; mkdir -p test; cd test; printf "\nABlog\nABlog Team\nhttps://ablog.readthedocs.org" | ablog start; ablog build -W; cd ..; rm -rf test

test4:
set -e; mkdir -p testablog; cd testablog; printf "\nABlog\nABlog Team\nhttps://ablog.readthedocs.org" | ablog start; ablog build; cd ..; rm -rf testablog
set -e; mkdir -p testablog; cd testablog; printf "\nABlog\nABlog Team\nhttps://ablog.readthedocs.org" | ablog start; ablog build -W; cd ..; rm -rf testablog

test5:
set -e; cd docs; ablog build -b latex -T -d .doctrees -w _latex; git clean -xfd; cd ..
set -e; cd docs; ablog build -W -b latex -T -d .doctrees -w _latex; git clean -xfd; cd ..

tests: test test1 test2 test3 test4 test5
4 changes: 2 additions & 2 deletions ablog/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ def ablog_serve(website=None, port=8000, view=True, rebuild=False, patterns="*.r
observer.start()
try:
if view:
(webbrowser.open_new_tab(f"http://127.0.0.1:{port}") and httpd.serve_forever())
webbrowser.open_new_tab(f"http://127.0.0.1:{port}") and httpd.serve_forever()
else:
httpd.serve_forever()
except KeyboardInterrupt:
Expand All @@ -314,7 +314,7 @@ def ablog_serve(website=None, port=8000, view=True, rebuild=False, patterns="*.r

else:
if view:
(webbrowser.open_new_tab(f"http://127.0.0.1:{port}") and httpd.serve_forever())
webbrowser.open_new_tab(f"http://127.0.0.1:{port}") and httpd.serve_forever()
else:
httpd.serve_forever()

Expand Down
2 changes: 1 addition & 1 deletion ablog/start.py
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ def w(t, ls=80):
# keep_warnings = False
# If true, `todo` and `todoList` produce output, else they produce nothing.
todo_include_todos = "{ext_todo:}"
todo_include_todos = {ext_todo}
# -- Options for HTML output ----------------------------------------------
Expand Down
16 changes: 8 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ stages:
libraries:
apt:
- pandoc
- graphviz
envs:
- linux: py310-sphinx4
- linux: py310-sphinx5

- stage: SecondPhaseTests
displayName: Stage 2 Tests
Expand All @@ -58,15 +59,18 @@ stages:
libraries:
brew:
- pandoc
- graphviz
choco:
- pandoc
- graphviz
apt:
- pandoc
- graphviz
envs:
- macos: py37-sphinx4
- windows: py37-sphinx4
- linux: py38-sphinx4
- linux: py39-sphinx4
- linux: py38-sphinx5
- linux: py39-sphinx5

- stage: ThirdPhaseTests
displayName: Stage 3 Tests
Expand All @@ -77,13 +81,9 @@ stages:
submodules: false
coverage: codecov
libraries:
brew:
- pandoc
choco:
- pandoc
apt:
- pandoc
- graphviz
envs:
- linux: py310-sphinxdev
- linux: py39-conda
- linux: py39-docs
13 changes: 13 additions & 0 deletions docs/release/ablog-v0.10-released.rst
Original file line number Diff line number Diff line change
Expand Up @@ -335,3 +335,16 @@ ABlog v0.10.25 released
Pull Requests merged in:

`Normalise path to posix as sphinx expects <https://github.com/sunpy/ablog/pull/134>`__.

ABlog v0.10.26 released
-----------------------
.. post:: July 8, 2022
:author: Nabil
:category: Release
:location: World

Pull Requests merged in:

`docs: Fix format of sphinx.ext.extlink for Sphinx 5.x <https://github.com/sunpy/ablog/pull/141>`__.
`docs: Use ref link rather than hardcode link <https://github.com/sunpy/ablog/pull/140>`__.
`Ci and Warnings Fix <https://github.com/sunpy/ablog/pull/142>`__.
10 changes: 8 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
#!/usr/bin/env python
from setuptools import setup # isort:skip
from itertools import chain

from setuptools import setup
from setuptools.config import read_configuration
try:
# Recommended for setuptools 61.0.0+
# (though may disappear in the future)
from setuptools.config.setupcfg import read_configuration
except ImportError:
from setuptools.config import read_configuration

################################################################################
# Programmatically generate some extras combos.
Expand Down
31 changes: 2 additions & 29 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{36,37,38,39,310}{-sphinx4,-sphinxdev,-docs,-conda}
py{37,38,39,310}{-sphinx4,-sphinx5,-sphinxdev,-docs}
codestyle
requires =
setuptools >= 30.3.0
Expand All @@ -18,6 +18,7 @@ whitelist_externals=
deps =
sphinx4: sphinx>=4.0,<5.0
sphinx5: sphinx>=5.0,<6.0
sphinx6: sphinx>=6.0,<7.0
# This is ignored as myst-parser has pinned the max version of sphinx.
sphinxdev: git+https://github.com/sphinx-doc/sphinx
# The following indicates which extras_require from setup.cfg will be installed
Expand All @@ -26,11 +27,6 @@ extras =
all
docs
tests
passenv =
HTTP_PROXY
HTTPS_PROXY
NO_PROXY
CIRCLECI
commands =
# Have to do this here as myst-parser in the install step forcings it to be non-dev.
sphinxdev: pip install -U git+https://github.com/sphinx-doc/sphinx
Expand All @@ -52,26 +48,3 @@ deps =
commands =
pre-commit install-hooks
pre-commit run --color always --verbose --all-files --show-diff-on-failure

# This env requires tox-conda.
[testenv:conda]
extras =
deps =
conda_deps =
alabaster
docutils
feedgen
invoke
ipython
myst-parser
nbsphinx
pytest
python-dateutil
sphinx
sphinx-automodapi
watchdog
conda_channels = conda-forge
install_command = pip install --no-deps {opts} {packages}
commands =
pytest
make tests

0 comments on commit 4fe4966

Please sign in to comment.