Skip to content

Commit 661fc27

Browse files
committed
adopt pydata-sphinx-theme
move howto docs into subfolder
1 parent b2199d6 commit 661fc27

File tree

16 files changed

+63
-34
lines changed

16 files changed

+63
-34
lines changed

AUTHORS.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,9 @@ The following people have contributed to the project:
9292

9393
as reported by:
9494

95-
git log --all --format='- %aN (%aE)' | sort -u | sed 's/@/ AT /1' | sed -e 's/\.\([^ ]\)/ DOT \1/g'
95+
```
96+
git log --all --format='- %aN (%aE)' | sort -u | sed 's/@/ AT /1' | sed -e 's/\.\([^ ]\)/ DOT \1/g'
97+
```
9698

9799
with some adjustments.
98100

CONTRIBUTING.md

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
For a good bug report:
44

5-
1. [Search][] for existing Issues, both on GitHub and in general with Google/Stack Overflow before posting a duplicate question.
6-
2. Update to pyzmq master, if possible, especially if you are already using git. It's
5+
1. [Search] for existing Issues, both on GitHub and in general with Google/Stack Overflow before posting a duplicate question.
6+
1. Update to pyzmq master, if possible, especially if you are already using git. It's
77
possible that the bug you are about to report has already been fixed.
88

99
Many things reported as pyzmq Issues are often just libzmq-related,
1010
and don't have anything to do with pyzmq itself.
11-
These are better directed to [zeromq-dev][].
11+
These are better directed to [zeromq-dev].
1212

1313
When making a bug report, it is helpful to tell us as much as you can about your system
1414
(such as pyzmq version, libzmq version, Python version, OS Version, how you built/installed pyzmq and libzmq, etc.)
@@ -26,13 +26,12 @@ print("Python-%s" % sys.version)
2626

2727
Which will give something like:
2828

29-
libzmq-3.3.0
30-
pyzmq-2.2dev
31-
Python-2.7.2 (default, Jun 20 2012, 16:23:33)
32-
[GCC 4.2.1 Compatible Apple Clang 4.0 (tags/Apple/clang-418.0.60)]
33-
34-
[search]: https://github.com/zeromq/pyzmq/issues
35-
[zeromq-dev]: mailto:[email protected]
29+
```
30+
libzmq-4.3.4
31+
pyzmq-22.3.0
32+
Python-3.9.9 | packaged by conda-forge | (main, Dec 20 2021, 02:38:53)
33+
[Clang 11.1.0 ]
34+
```
3635

3736
# Licensing and contributing to PyZMQ
3837

@@ -58,28 +57,35 @@ When you contribute to PyZMQ, your contributions are made under the same
5857
license as the file you are working on. Any new, original code should be BSD
5958
licensed.
6059

61-
We don't enforce strict style, but when in doubt [PEP8][] is a good guideline.
62-
The only thing we really don't like is mixing up 'cleanup' in real work.
60+
We use [pre-commit] for autoformatting,
61+
so you hopefully don't need to worry too much about style.
6362

64-
Examples are copyright their respective authors, and BSD unless otherwise
65-
specified by the author. You can LGPL (or GPL or MIT or Apache, etc.) your own new
66-
examples if you like, but we strongly encourage using the default BSD license.
63+
To install pre-commit:
64+
65+
```
66+
pip install pre-commit
67+
pre-commit install
68+
```
6769

68-
[pep8]: http://www.python.org/dev/peps/pep-0008
70+
Examples are copyright their respective authors, and BSD unless otherwise
71+
specified by the author.
6972

7073
## Inherited licenses in pyzmq
7174

7275
Some code outside the core is taken from other open-source projects, and
7376
inherits that project's license.
7477

75-
- zmq/eventloop contains files inherited and adapted from [tornado][], and inherits the Apache license
78+
- zmq/eventloop contains files inherited and adapted from [tornado], and inherits the Apache license
7679

77-
- zmq/ssh/forward.py is from [paramiko][], and inherits LGPL
80+
- zmq/ssh/forward.py is from [paramiko], and inherits LGPL
7881

7982
- zmq/devices/monitoredqueue.pxd is derived from the zmq_device function in
8083
libzmq, and inherits LGPL
8184

8285
- perf examples are (c) iMatix, and LGPL
8386

84-
[tornado]: http://www.tornadoweb.org
8587
[paramiko]: http://www.lag.net/paramiko
88+
[pre-commit]: https://pre-commit.com
89+
[search]: https://github.com/zeromq/pyzmq/issues
90+
[tornado]: http://www.tornadoweb.org
91+
[zeromq-dev]: mailto:[email protected]

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://github.com/zeromq/pyzmq/actions/workflows/test.yml/badge.svg)](https://github.com/zeromq/pyzmq/actions/workflows/test.yml)
44

5-
This package contains Python bindings for [ØMQ](http://www.zeromq.org).
5+
This package contains Python bindings for [ØMQ](https://zeromq.org).
66
ØMQ is a lightweight and fast messaging implementation.
77

88
PyZMQ should work with any reasonable version of Python (≥ 3.4),
@@ -36,7 +36,7 @@ Python version of every example. We also have some information on our
3636

3737
Unless you specifically want to develop PyZMQ, we recommend downloading
3838
the PyZMQ source code or wheels from
39-
[PyPI](https://pypi.io/project/pyzmq),
39+
[PyPI](https://pypi.io/project/pyzmq/),
4040
or install with conda.
4141

4242
You can also get the latest source code from our GitHub repository, but

docs/requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cython>=0.29
22
enum-tools[sphinx]>=0.9
33
gevent
44
myst-parser[linkify]
5+
pydata_sphinx_theme
56
pygments>=2.6
67
sphinx>=3.0.4
78
sphinx-rtd-theme==0.5.*

docs/source/changelog.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Fixes:
225225
- Cython backend: Build Cython extensions with language level "3str" (requires Cython 0.29)
226226
- Cython backend: You can now `cimport zmq`
227227
- Asyncio: Fix memory leak in Poller
228-
- Log: Much improved logging in {mod}`zmq.log` (see {doc}`logging`)
228+
- Log: Much improved logging in {mod}`zmq.log` (see {doc}`howto/logging`)
229229
- Log: add `python -m zmq.log` entrypoint
230230
- Sources generated with Cython 0.29.15
231231

docs/source/conf.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,20 @@
122122

123123
# The theme to use for HTML and HTML Help pages. Major themes that come with
124124
# Sphinx are currently 'default' and 'sphinxdoc'.
125-
html_theme = 'sphinx_rtd_theme'
126-
125+
html_theme = "pydata_sphinx_theme"
126+
127+
# html_logo = "_static/logo.png"
128+
129+
html_theme_options = {
130+
"icon_links": [
131+
{
132+
# Label for this link
133+
"name": "PyZMQ on GitHub",
134+
"url": "https://github.com/zeromq/pyzmq",
135+
"icon": "fab fa-github-square",
136+
}
137+
]
138+
}
127139
# Theme options are theme-specific and customize the look and feel of a theme
128140
# further. For a list of options available for each theme, see the
129141
# documentation.
File renamed without changes.
File renamed without changes.
File renamed without changes.

docs/source/howto/index.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Using PyZMQ
2+
3+
```{toctree}
4+
---
5+
maxdepth: 2
6+
---
7+
morethanbindings.rst
8+
serialization.rst
9+
devices.rst
10+
eventloop.rst
11+
draft.rst
12+
logging.rst
13+
ssh.rst
14+
```

0 commit comments

Comments
 (0)