diff --git a/.flake8 b/.flake8
index ec589f6d9..c96c5a826 100644
--- a/.flake8
+++ b/.flake8
@@ -1,3 +1,5 @@
+# flake8 no longer used,
+# ruff config in pyproject.toml
[flake8]
exclude = .git,dist,docs,zmq/eventloop/minitornado,buildutils/templates
ignore = E,W
diff --git a/.gitignore b/.gitignore
index d44b6204f..33da4cf2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,4 @@ _deps
/Makefile
_src
licenses
+.virtual_documents
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ba675be60..5e7460c17 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
language: python
pass_filenames: false
additional_dependencies:
- - black
+ - ruff
- repo: https://github.com/executablebooks/mdformat
rev: 0.7.17 # Use the ref you want to point at
hooks:
@@ -24,19 +24,24 @@ repos:
- mdformat-myst
exclude: LICENSE.md
- - repo: https://github.com/PyCQA/autoflake
- rev: v2.3.1
- hooks:
- - id: autoflake
- args:
- - --in-place
- exclude: zmq/tests/test_imports.py
+ # autoformat and lint Python code
+ - repo: https://github.com/astral-sh/ruff-pre-commit
+ rev: v0.3.2
+ hooks:
+ - id: ruff
+ types_or:
+ - python
+ - jupyter
+ - pyi
+ args: ["--fix", "--show-fixes"]
+ - id: ruff-format
+ types_or:
+ - python
+ - jupyter
+ - pyi
+ # don't format zmq/constants.py twice
+ exclude: zmq/constants.py
- - repo: https://github.com/PyCQA/flake8
- rev: 7.0.0
- hooks:
- - id: flake8
- exclude: ^buildutils/templates/
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.9.0
hooks:
@@ -49,29 +54,6 @@ repos:
args: [zmq]
additional_dependencies:
- types-paramiko
- - repo: https://github.com/asottile/pyupgrade
- rev: v3.15.2
- hooks:
- - id: pyupgrade
- args:
- - --py36-plus
- - repo: https://github.com/pycqa/isort
- rev: 5.13.2
- hooks:
- - id: isort
- name: isort (python)
- - id: isort
- name: isort (cython)
- types: [cython]
- - id: isort
- name: isort (pyi)
- types: [pyi]
- - repo: https://github.com/psf/black
- rev: 24.3.0
- hooks:
- - id: black
- # don't run black twice on constants.py
- exclude: zmq/constants.py
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
hooks:
diff --git a/RELICENSE/authors.py b/RELICENSE/authors.py
index 21e4c531c..492922d96 100644
--- a/RELICENSE/authors.py
+++ b/RELICENSE/authors.py
@@ -82,15 +82,5 @@ def sort_key(email_commits):
commits[0].authored_datetime.year,
)
else:
- msg = "{commits} commits ({start}-{end})".format(
- commits=len(commits),
- start=commits[-1].authored_datetime.year,
- end=commits[0].authored_datetime.year,
- )
- print(
- "- [ ] {name} {email}: {msg}".format(
- name=email_names[email],
- email=email,
- msg=msg,
- )
- )
+ msg = f"{len(commits)} commits ({commits[-1].authored_datetime.year}-{commits[0].authored_datetime.year})"
+ print(f"- [ ] {email_names[email]} {email}: {msg}")
diff --git a/buildutils/constants.py b/buildutils/constants.py
index f2594c5ee..59d8b0308 100644
--- a/buildutils/constants.py
+++ b/buildutils/constants.py
@@ -25,7 +25,7 @@
root = pjoin(buildutils, os.path.pardir)
sys.path.insert(0, pjoin(root, 'zmq'))
-import constants
+import constants # noqa: E402
all_names = []
for name in constants.__all__:
@@ -49,7 +49,7 @@ def cython_enums():
lines = []
for name in all_names:
if no_prefix(name):
- lines.append('enum: ZMQ_{0} "{0}"'.format(name))
+ lines.append(f'enum: ZMQ_{name} "{name}"')
else:
lines.append(f'enum: ZMQ_{name}')
@@ -112,7 +112,7 @@ def generate_file(fname, ns_func, dest_dir="."):
with open(dest, 'w') as f:
f.write(out)
if fname.endswith(".py"):
- run([sys.executable, "-m", "black", dest])
+ run(["ruff", "format", dest])
def render_constants():
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 494f466df..d4b657097 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -19,7 +19,7 @@
sys.path.append(str(repo_root))
# set target libzmq version
-from buildutils.bundle import bundled_version
+from buildutils.bundle import bundled_version # noqa
# remove repo root from sys.path
sys.path = sys.path[:-1]
diff --git a/examples/asyncio/helloworld_pubsub_dealerrouter.py b/examples/asyncio/helloworld_pubsub_dealerrouter.py
index 543a20533..c0ce104fa 100644
--- a/examples/asyncio/helloworld_pubsub_dealerrouter.py
+++ b/examples/asyncio/helloworld_pubsub_dealerrouter.py
@@ -195,11 +195,7 @@ async def lang_changer_router(self) -> None:
)
self.hello_world.change_language()
- print(
- "Changed language! New language is: {}\n".format(
- self.hello_world.lang
- )
- )
+ print(f"Changed language! New language is: {self.hello_world.lang}\n")
except Exception as e:
print("Error with sub world")
diff --git a/examples/device/device.py b/examples/device/device.py
index 77ebd3963..241723bb0 100644
--- a/examples/device/device.py
+++ b/examples/device/device.py
@@ -3,7 +3,6 @@
# This example is placed in the Public Domain
# It may also be used under the Creative Commons CC-0 License, (C) PyZMQ Developers
-
import time
from threading import Thread
diff --git a/examples/eventloop/echostream.py b/examples/eventloop/echostream.py
index 28e31844c..daec9f50f 100644
--- a/examples/eventloop/echostream.py
+++ b/examples/eventloop/echostream.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-"""Adapted echo.py to put the send in the event loop using a ZMQStream.
-"""
+"""Adapted echo.py to put the send in the event loop using a ZMQStream."""
+
from typing import List
from tornado import ioloop
diff --git a/examples/pubsub/subscriber.py b/examples/pubsub/subscriber.py
index a1d8d4a5b..0e890d924 100644
--- a/examples/pubsub/subscriber.py
+++ b/examples/pubsub/subscriber.py
@@ -10,7 +10,6 @@
# the file LICENSE.BSD, distributed as part of this software.
# -----------------------------------------------------------------------------
-
import sys
import time
diff --git a/examples/security/asyncio-ironhouse.py b/examples/security/asyncio-ironhouse.py
index ce8ef46e7..9041c3e1c 100644
--- a/examples/security/asyncio-ironhouse.py
+++ b/examples/security/asyncio-ironhouse.py
@@ -98,9 +98,7 @@ async def run() -> None:
if __name__ == '__main__':
if zmq.zmq_version_info() < (4, 0):
raise RuntimeError(
- "Security is not supported in libzmq version < 4.0. libzmq version {}".format(
- zmq.zmq_version()
- )
+ f"Security is not supported in libzmq version < 4.0. libzmq version {zmq.zmq_version()}"
)
if '-v' in sys.argv:
diff --git a/examples/security/generate_certificates.py b/examples/security/generate_certificates.py
index 2b1511989..f890ac272 100644
--- a/examples/security/generate_certificates.py
+++ b/examples/security/generate_certificates.py
@@ -55,9 +55,7 @@ def generate_certificates(base_dir: Union[str, os.PathLike]) -> None:
if __name__ == '__main__':
if zmq.zmq_version_info() < (4, 0):
raise RuntimeError(
- "Security is not supported in libzmq version < 4.0. libzmq version {}".format(
- zmq.zmq_version()
- )
+ f"Security is not supported in libzmq version < 4.0. libzmq version {zmq.zmq_version()}"
)
generate_certificates(os.path.dirname(__file__))
diff --git a/examples/security/grasslands.py b/examples/security/grasslands.py
index fda56b2ed..deaa28b96 100644
--- a/examples/security/grasslands.py
+++ b/examples/security/grasslands.py
@@ -3,10 +3,10 @@
'''
No protection at all.
-All connections are accepted, there is no authentication, and no privacy.
+All connections are accepted, there is no authentication, and no privacy.
-This is how ZeroMQ always worked until we built security into the wire
-protocol in early 2013. Internally, it uses a security mechanism called
+This is how ZeroMQ always worked until we built security into the wire
+protocol in early 2013. Internally, it uses a security mechanism called
"NULL".
Author: Chris Laws
diff --git a/examples/security/ioloop-ironhouse.py b/examples/security/ioloop-ironhouse.py
index 383814c21..26d78d00c 100644
--- a/examples/security/ioloop-ironhouse.py
+++ b/examples/security/ioloop-ironhouse.py
@@ -121,9 +121,7 @@ async def run() -> None:
if __name__ == '__main__':
if zmq.zmq_version_info() < (4, 0):
raise RuntimeError(
- "Security is not supported in libzmq version < 4.0. libzmq version {}".format(
- zmq.zmq_version()
- )
+ f"Security is not supported in libzmq version < 4.0. libzmq version {zmq.zmq_version()}"
)
if '-v' in sys.argv:
diff --git a/examples/security/ironhouse.py b/examples/security/ironhouse.py
index 02912b117..4722b6de4 100644
--- a/examples/security/ironhouse.py
+++ b/examples/security/ironhouse.py
@@ -89,9 +89,7 @@ def run() -> None:
if __name__ == '__main__':
if zmq.zmq_version_info() < (4, 0):
raise RuntimeError(
- "Security is not supported in libzmq version < 4.0. libzmq version {}".format(
- zmq.zmq_version()
- )
+ f"Security is not supported in libzmq version < 4.0. libzmq version {zmq.zmq_version()}"
)
if '-v' in sys.argv:
diff --git a/examples/security/stonehouse.py b/examples/security/stonehouse.py
index 962d04d84..eec6dafd7 100644
--- a/examples/security/stonehouse.py
+++ b/examples/security/stonehouse.py
@@ -88,9 +88,7 @@ def run() -> None:
if __name__ == '__main__':
if zmq.zmq_version_info() < (4, 0):
raise RuntimeError(
- "Security is not supported in libzmq version < 4.0. libzmq version {}".format(
- zmq.zmq_version()
- )
+ f"Security is not supported in libzmq version < 4.0. libzmq version {zmq.zmq_version()}"
)
if '-v' in sys.argv:
diff --git a/examples/security/strawhouse.py b/examples/security/strawhouse.py
index 93d62a6ba..1e6ade8fe 100644
--- a/examples/security/strawhouse.py
+++ b/examples/security/strawhouse.py
@@ -83,9 +83,7 @@ def run() -> None:
if __name__ == '__main__':
if zmq.zmq_version_info() < (4, 0):
raise RuntimeError(
- "Security is not supported in libzmq version < 4.0. libzmq version {}".format(
- zmq.zmq_version()
- )
+ f"Security is not supported in libzmq version < 4.0. libzmq version {zmq.zmq_version()}"
)
if '-v' in sys.argv:
diff --git a/examples/security/woodhouse.py b/examples/security/woodhouse.py
index 2a5f6599d..b1c8372b2 100644
--- a/examples/security/woodhouse.py
+++ b/examples/security/woodhouse.py
@@ -79,9 +79,7 @@ def run() -> None:
if __name__ == '__main__':
if zmq.zmq_version_info() < (4, 0):
raise RuntimeError(
- "Security is not supported in libzmq version < 4.0. libzmq version {}".format(
- zmq.zmq_version()
- )
+ f"Security is not supported in libzmq version < 4.0. libzmq version {zmq.zmq_version()}"
)
if '-v' in sys.argv:
diff --git a/perf/Dockerfile b/perf/Dockerfile
index 2a83d934e..e80565dcd 100644
--- a/perf/Dockerfile
+++ b/perf/Dockerfile
@@ -1,9 +1,9 @@
-FROM python:3.6
-RUN pip install pandas cython
-RUN pip install -vv https://github.com/zeromq/pyzmq/archive/master.tar.gz --install-option=--zmq=bundled
+FROM python:3.11
+RUN pip install pandas
+RUN pip install --pre pyzmq
RUN mkdir /data && mkdir /perf
ADD *.py /perf/
WORKDIR /data
-ENTRYPOINT ["python", "/perf/collect.py"]
+ENTRYPOINT ["python3", "/perf/collect.py"]
CMD ["thr"]
diff --git a/perf/Makefile b/perf/Makefile
index 2de297c99..78c784432 100644
--- a/perf/Makefile
+++ b/perf/Makefile
@@ -1,8 +1,8 @@
-BASE_IMAGE=python:3.6
+BASE_IMAGE=python:3.11
IMAGE=pyzmq-perf
VOLUME=pyzmq-perf
-ifeq ($(DOCKER_MACHINE_NAME), "")
+ifeq ("$(DOCKER_MACHINE_NAME)", "")
OUT_PATH=$(PWD)
FETCH=true
else
diff --git a/perf/perf.ipynb b/perf/perf.ipynb
index e94b2d9aa..1e3774468 100644
--- a/perf/perf.ipynb
+++ b/perf/perf.ipynb
@@ -25,28 +25,45 @@
"metadata": {},
"outputs": [],
"source": [
- "import matplotlib.pyplot as plt\n",
"import pickle\n",
"\n",
- "plt.ion()\n",
+ "import altair as alt\n",
+ "import pandas as pd\n",
"\n",
- "def crossover(data, column):\n",
+ "\n",
+ "def crossover(data, column, ylabel=\"msgs/sec\"):\n",
" \"\"\"Plot the crossover for copy=True|False\"\"\"\n",
- " for copy, df in data.groupby('copy'):\n",
- " plt.loglog(df['size'], df[column], 'v', label='copy' if copy else 'nocopy')\n",
- " plt.xlabel('size (B)')\n",
- " plt.ylabel('msgs/sec')\n",
- " plt.legend(loc=0)\n",
+ " return (\n",
+ " alt.Chart(data)\n",
+ " .mark_point()\n",
+ " .encode(\n",
+ " color=\"copy\",\n",
+ " x=alt.X(\"size\", title=\"size (B)\").scale(type=\"log\"),\n",
+ " y=alt.Y(column, title=ylabel).scale(type=\"log\"),\n",
+ " )\n",
+ " )\n",
"\n",
"\n",
- "def relative(data, column, scale='semilogx'):\n",
+ "def relative(data, column, yscale=\"linear\"):\n",
" \"\"\"Plot a normalized value showing relative performance\"\"\"\n",
- " copy_mean = data[data['copy']].groupby('size')[column].mean()\n",
- " no_copy = data[data['copy'] == False]\n",
- " reference = copy_mean[no_copy['size']]\n",
- " plot = getattr(plt, scale)\n",
- " plot(no_copy['size'], (no_copy[column] / reference.data), 'v')\n",
- " plt.xlabel(\"size (B)\")\n"
+ " copy_mean = data[data[\"copy\"]].groupby(\"size\")[column].mean()\n",
+ " no_copy = data[~data[\"copy\"]]\n",
+ " reference = copy_mean[no_copy[\"size\"]]\n",
+ " return (\n",
+ " alt.Chart(\n",
+ " pd.DataFrame(\n",
+ " {\n",
+ " \"size\": no_copy[\"size\"],\n",
+ " \"no-copy speedup\": no_copy[column] / reference.array,\n",
+ " }\n",
+ " )\n",
+ " )\n",
+ " .mark_point()\n",
+ " .encode(\n",
+ " x=alt.X(\"size\", title=\"size (B)\").scale(type=\"log\"),\n",
+ " y=alt.Y(\"no-copy speedup\", title=\"\").scale(type=yscale),\n",
+ " )\n",
+ " )"
]
},
{
@@ -64,7 +81,7 @@
"metadata": {},
"outputs": [],
"source": [
- "with open('thr.pickle', 'rb') as f:\n",
+ "with open(\"thr.pickle\", \"rb\") as f:\n",
" thr = pickle.load(f)"
]
},
@@ -77,18 +94,18 @@
"data": {
"text/html": [
"\n",
- "\n",
"
\n",
" \n",
@@ -107,64 +124,64 @@
" \n",
" | 0 | \n",
" 100 | \n",
- " 327680 | \n",
+ " 655360 | \n",
" True | \n",
" False | \n",
" ipc | \n",
- " 475760.295347 | \n",
- " 264266.363135 | \n",
+ " 1.618701e+06 | \n",
+ " 412531.609473 | \n",
"
\n",
" \n",
" | 1 | \n",
" 100 | \n",
- " 655360 | \n",
+ " 1310720 | \n",
" True | \n",
" False | \n",
" ipc | \n",
- " 367704.492809 | \n",
- " 259478.511243 | \n",
+ " 1.636403e+06 | \n",
+ " 415309.020795 | \n",
"
\n",
" \n",
" | 2 | \n",
" 100 | \n",
- " 1310720 | \n",
- " True | \n",
+ " 262144 | \n",
+ " False | \n",
" False | \n",
" ipc | \n",
- " 426573.892233 | \n",
- " 258967.498492 | \n",
+ " 1.781225e+05 | \n",
+ " 178051.290985 | \n",
"
\n",
" \n",
" | 3 | \n",
" 100 | \n",
- " 51200 | \n",
+ " 524288 | \n",
" False | \n",
" False | \n",
" ipc | \n",
- " 34390.097183 | \n",
- " 34388.754455 | \n",
+ " 1.817957e+05 | \n",
+ " 181758.942987 | \n",
"
\n",
" \n",
" | 4 | \n",
- " 100 | \n",
- " 102400 | \n",
- " False | \n",
+ " 215 | \n",
+ " 524288 | \n",
+ " True | \n",
" False | \n",
" ipc | \n",
- " 37725.643364 | \n",
- " 37723.441428 | \n",
+ " 1.599087e+06 | \n",
+ " 408223.469186 | \n",
"
\n",
" \n",
"
\n",
"