Skip to content

Commit

Permalink
Merge pull request ivre#1605 from p-l-/py312
Browse files Browse the repository at this point in the history
Python: support 3.12
  • Loading branch information
p-l- authored Jan 12, 2024
2 parents 5bb1004 + 7b5d521 commit 6a5fdff
Show file tree
Hide file tree
Showing 42 changed files with 58 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ dependency makes it harder for users to install IVRE.

We try to comply with the some guidelines for new code:

- The code **must** be compatible with Python 3.7 to 3.11.
- The code **must** be compatible with Python 3.7 to 3.12.

- The code should be PEP-8 compliant; you can check your code with
[pep8](https://pypi.python.org/pypi/pep8).
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/elastic.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of IVRE.
# Copyright 2011 - 2022 Pierre LALET <[email protected]>
# Copyright 2011 - 2024 Pierre LALET <[email protected]>
#
# IVRE is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.11']
python-version: ['3.7', '3.12']
mongodb-version: ['5.0']
elastic-version: ['7.10.2']

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of IVRE.
# Copyright 2011 - 2023 Pierre LALET <[email protected]>
# Copyright 2011 - 2024 Pierre LALET <[email protected]>
#
# IVRE is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.11']
python-version: ['3.12']

steps:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/maxmind.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of IVRE.
# Copyright 2011 - 2022 Pierre LALET <[email protected]>
# Copyright 2011 - 2024 Pierre LALET <[email protected]>
#
# IVRE is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.11']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']

steps:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mongodb.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of IVRE.
# Copyright 2011 - 2023 Pierre LALET <[email protected]>
# Copyright 2011 - 2024 Pierre LALET <[email protected]>
#
# IVRE is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand All @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
# https://docs.mongodb.com/drivers/pymongo/#compatibility
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
mongodb-version: ['3.6', '5.0']

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/postgres.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of IVRE.
# Copyright 2011 - 2022 Pierre LALET <[email protected]>
# Copyright 2011 - 2024 Pierre LALET <[email protected]>
#
# IVRE is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.11']
python-version: ['3.7', '3.12']
postgresql-version: ['12', '13']

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sqlite.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of IVRE.
# Copyright 2011 - 2022 Pierre LALET <[email protected]>
# Copyright 2011 - 2024 Pierre LALET <[email protected]>
#
# IVRE is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.11']
python-version: ['3.7', '3.12']

steps:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tinydb.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This file is part of IVRE.
# Copyright 2011 - 2023 Pierre LALET <[email protected]>
# Copyright 2011 - 2024 Pierre LALET <[email protected]>
#
# IVRE is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand All @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']

steps:

Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# pylint: disable=wrong-import-position,redefined-builtin
project = "IVRE"
copyright = "2011 - 2023, Pierre LALET"
copyright = "2011 - 2024, Pierre LALET"
author = "Pierre LALET"
html_logo = "../web/static/logo.png"
master_doc = "index"
Expand Down
5 changes: 2 additions & 3 deletions doc/dev/linting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@ GitHub actions

Code linting and spell checking is performed in a dedicated `GitHub
action <https://github.com/ivre/ivre/actions/workflows/linting.yml>`_
(see :ref:`dev/tests:GitHub actions`), togethter with the Maxmind
tests. Pylint and Codespell only run with Python 3.11, while Flake8
runs with all Python versions.
(see :ref:`dev/tests:GitHub actions`), with the latest supported
Python version.
4 changes: 2 additions & 2 deletions doc/dev/tests.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ place your samples there (the PCAP files must have the extension
and the Nmap JSON results must have the extension ``.json``).

Then, run ``python ./tests.py`` (optionally replace ``python`` by the
alternative interpreter you want to use, e.g., ``python3.11``; note
alternative interpreter you want to use, e.g., ``python3.12``; note
that ``coverage.py`` must be installed for this interpreter). The
first run will create a ``samples/results`` file with the expected
values for some results. The next runs will use those values to check
Expand Down Expand Up @@ -87,6 +87,6 @@ GitHub actions

Tests are run with several MongoDB and PostgreSQL versions, as well as
TinyDB, SQLite and Elasticsearch for each pull requests. The tests run
with Python 3.7 to 3.11.
with Python 3.7 to 3.12.

The configurations are in the `.github/workflows/*.yml` YAML files.
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /usr/bin/env python

# This file is part of IVRE.
# Copyright 2011 - 2023 Pierre LALET <[email protected]>
# Copyright 2011 - 2024 Pierre LALET <[email protected]>
#
# IVRE is free software: you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -154,6 +154,7 @@ def _write_pkg_file(self, file):
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Topic :: Scientific/Engineering :: Information Analysis",
"Topic :: Security",
"Topic :: System :: Networking",
Expand Down
5 changes: 2 additions & 3 deletions web/static/doc/_sources/dev/linting.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@ GitHub actions

Code linting and spell checking is performed in a dedicated `GitHub
action <https://github.com/ivre/ivre/actions/workflows/linting.yml>`_
(see :ref:`dev/tests:GitHub actions`), togethter with the Maxmind
tests. Pylint and Codespell only run with Python 3.11, while Flake8
runs with all Python versions.
(see :ref:`dev/tests:GitHub actions`), with the latest supported
Python version.
4 changes: 2 additions & 2 deletions web/static/doc/_sources/dev/tests.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ place your samples there (the PCAP files must have the extension
and the Nmap JSON results must have the extension ``.json``).

Then, run ``python ./tests.py`` (optionally replace ``python`` by the
alternative interpreter you want to use, e.g., ``python3.11``; note
alternative interpreter you want to use, e.g., ``python3.12``; note
that ``coverage.py`` must be installed for this interpreter). The
first run will create a ``samples/results`` file with the expected
values for some results. The next runs will use those values to check
Expand Down Expand Up @@ -87,6 +87,6 @@ GitHub actions

Tests are run with several MongoDB and PostgreSQL versions, as well as
TinyDB, SQLite and Elasticsearch for each pull requests. The tests run
with Python 3.7 to 3.11.
with Python 3.7 to 3.12.

The configurations are in the `.github/workflows/*.yml` YAML files.
2 changes: 1 addition & 1 deletion web/static/doc/dev/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ <h1>Development<a class="headerlink" href="#development" title="Link to this hea
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
7 changes: 3 additions & 4 deletions web/static/doc/dev/linting.html
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,8 @@ <h2>Running the linters<a class="headerlink" href="#running-the-linters" title="
<h2>GitHub actions<a class="headerlink" href="#github-actions" title="Link to this heading"></a></h2>
<p>Code linting and spell checking is performed in a dedicated <a class="reference external" href="https://github.com/ivre/ivre/actions/workflows/linting.yml">GitHub
action</a>
(see <a class="reference internal" href="tests.html#github-actions"><span class="std std-ref">GitHub actions</span></a>), togethter with the Maxmind
tests. Pylint and Codespell only run with Python 3.11, while Flake8
runs with all Python versions.</p>
(see <a class="reference internal" href="tests.html#github-actions"><span class="std std-ref">GitHub actions</span></a>), with the latest supported
Python version.</p>
</section>
</section>

Expand All @@ -143,7 +142,7 @@ <h2>GitHub actions<a class="headerlink" href="#github-actions" title="Link to th
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
6 changes: 3 additions & 3 deletions web/static/doc/dev/tests.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ <h2>First run<a class="headerlink" href="#first-run" title="Link to this heading
<code class="docutils literal notranslate"><span class="pre">.pcap</span></code>, the Nmap XML result files must have the extension <code class="docutils literal notranslate"><span class="pre">.xml</span></code>,
and the Nmap JSON results must have the extension <code class="docutils literal notranslate"><span class="pre">.json</span></code>).</p>
<p>Then, run <code class="docutils literal notranslate"><span class="pre">python</span> <span class="pre">./tests.py</span></code> (optionally replace <code class="docutils literal notranslate"><span class="pre">python</span></code> by the
alternative interpreter you want to use, e.g., <code class="docutils literal notranslate"><span class="pre">python3.11</span></code>; note
alternative interpreter you want to use, e.g., <code class="docutils literal notranslate"><span class="pre">python3.12</span></code>; note
that <code class="docutils literal notranslate"><span class="pre">coverage.py</span></code> must be installed for this interpreter). The
first run will create a <code class="docutils literal notranslate"><span class="pre">samples/results</span></code> file with the expected
values for some results. The next runs will use those values to check
Expand Down Expand Up @@ -185,7 +185,7 @@ <h2>Failures<a class="headerlink" href="#failures" title="Link to this heading">
<h2>GitHub actions<a class="headerlink" href="#github-actions" title="Link to this heading"></a></h2>
<p>Tests are run with several MongoDB and PostgreSQL versions, as well as
TinyDB, SQLite and Elasticsearch for each pull requests. The tests run
with Python 3.7 to 3.11.</p>
with Python 3.7 to 3.12.</p>
<p>The configurations are in the <cite>.github/workflows/*.yml</cite> YAML files.</p>
</section>
</section>
Expand All @@ -201,7 +201,7 @@ <h2>GitHub actions<a class="headerlink" href="#github-actions" title="Link to th
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/dev/web-api.html
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ <h1>Web API<a class="headerlink" href="#web-api" title="Link to this heading">
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/genindex.html
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ <h1 id="index">Index</h1>
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/http-routingtable.html
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ <h1>HTTP Routing Table</h1>
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ <h2>Indices and tables<a class="headerlink" href="#indices-and-tables" title="Li
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/install/agents.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ <h3><strong>runscansagentdb</strong>, the “modern” (but probably broken) one
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/install/config.html
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ <h2>Misc<a class="headerlink" href="#misc" title="Link to this heading"></a><
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/install/docker.html
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ <h2>Initialization<a class="headerlink" href="#initialization" title="Link to th
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/install/fast-install-and-first-run.html
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ <h2>Some remarks<a class="headerlink" href="#some-remarks" title="Link to this h
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/install/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ <h1>Installation<a class="headerlink" href="#installation" title="Link to this h
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/install/installation.html
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ <h2>Using Agents<a class="headerlink" href="#using-agents" title="Link to this h
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/license-external.html
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ <h2>Logo<a class="headerlink" href="#logo" title="Link to this heading"></a><
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ <h3>17. Interpretation of Sections 15 and 16.<a class="headerlink" href="#interp
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/overview/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ <h2>How can I configure iptables to get logs used by flow2db tool<a class="heade
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/overview/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ <h1>Overview<a class="headerlink" href="#overview" title="Link to this heading">
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/overview/principles.html
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ <h2>Accessing data<a class="headerlink" href="#accessing-data" title="Link to th
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
2 changes: 1 addition & 1 deletion web/static/doc/overview/screenshots.html
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ <h2>IVRE as a plugin<a class="headerlink" href="#ivre-as-a-plugin" title="Link t
<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2011 - 2023, Pierre LALET.</p>
<p>&#169; Copyright 2011 - 2024, Pierre LALET.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
Expand Down
Loading

0 comments on commit 6a5fdff

Please sign in to comment.