Skip to content

Commit

Permalink
add support python 3.12 and drop support python 3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
ekneg54 committed Oct 2, 2023
1 parent 80b9b41 commit ff86e38
Show file tree
Hide file tree
Showing 16 changed files with 282 additions and 277 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// Update 'VARIANT' to pick a Python version: 3, 3.10, 3.9, 3.8, 3.7, 3.6
// Append -bullseye or -buster to pin to an OS version.
// Use -bullseye variants on local on arm64/Apple Silicon.
"VARIANT": "3.11",
"VARIANT": "3.12",
// Options
"NODE_VERSION": "none"
}
Expand Down Expand Up @@ -40,4 +40,4 @@
// "postCreateCommand": "pip3 install --user -r requirements.txt",
// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
"remoteUser": "vscode"
}
}
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:

strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:

strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:

strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -165,7 +165,7 @@ jobs:
containerbuild:
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3."]

runs-on: ubuntu-latest
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:

strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v3
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:

strategy:
matrix:
python-version: ["3.9"]
python-version: ["3.10"]

steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-latest-dev-release-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Initialize Python
uses: actions/setup-python@v1
with:
python-version: 3.9
python-version: 3.10

- name: Install dependencies
run: |
Expand All @@ -39,7 +39,7 @@ jobs:
containerbuild:
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]

runs-on: ubuntu-latest
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-release-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Initialize Python
uses: actions/setup-python@v1
with:
python-version: 3.9
python-version: 3.10
cache: "pip"

- name: Install dependencies
Expand All @@ -36,7 +36,7 @@ jobs:
containerbuild:
strategy:
matrix:
python-version: ["3.9", "3.10", "3.11"]
python-version: ["3.10", "3.11", "3.12"]

runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build:
apt_packages:
- "pandoc"
tools:
python: "3.9"
python: "3.10"
# You can also specify other tool versions:
# nodejs: "16"
# rust: "1.55"
Expand Down
7 changes: 5 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"python.testing.pytestEnabled": true,
"python.testing.unittestEnabled": false,
"python.linting.enabled": true,
"python.formatting.provider": "black",
"python.formatting.provider": "none",
"python.analysis.importFormat": "absolute",
"editor.formatOnSave": true,
"python.linting.pylintEnabled": true,
Expand All @@ -26,5 +26,8 @@
"**/*.pyc": true,
"**/.profile": true
},
"python.analysis.typeCheckingMode": "off"
"python.analysis.typeCheckingMode": "off",
"[python]": {
"editor.defaultFormatter": "ms-python.black-formatter"
}
}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG PYTHON_VERSION=3.9
ARG PYTHON_VERSION=3.10

FROM python:${PYTHON_VERSION}-bullseye as build
ARG LOGPREP_VERSION=latest
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ Details about the rule language and how to write rules for the processors can be

### Installation

Python should be present on the system, currently supported are the versions 3.9 - 3.11.
Python should be present on the system, currently supported are the versions 3.10 - 3.12.

To install Logprep you have following options:

Expand Down Expand Up @@ -283,16 +283,16 @@ Those can be executed via: `tox -e [name of the test environment]`.
For Example:
```
tox -e py39-all
tox -e py310-all
```
This runs all tests, calculates the test coverage and evaluates the code quality for the python
3.9 version.
3.10 version.
Multiple environments can be tested within one call:
```
tox -e py39-all -e py310-all -e py311-all
tox -e py310-all -e py311-all -e py312-all
```
If you want to run them in parallel attach the option `-p`.
Expand All @@ -308,7 +308,7 @@ tox -av
In case the requirements change, the test environments must be rebuilt with the parameter `-r`:
```
tox -e py39 -e py310 -e py311 -r
tox -e py310 -e py311 -e py312 -r
```
### Semgrep
Expand All @@ -322,7 +322,7 @@ pip install semgrep
Afterwards you can just call the tox environment with for example
```
tox -e py39-semgrep
tox -e py310-semgrep
```
### Running Logprep
Expand Down Expand Up @@ -461,7 +461,7 @@ Building the documentation is done by executing the following command from withi
the project root directory:

```
tox -e py39-docs
tox -e py310-docs
```

A HTML documentation can be then found in `doc/_build/html/index.html`.
Expand Down
2 changes: 1 addition & 1 deletion doc/source/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Getting Started
Installation
============

Python should be present on the system. Currently, Python 3.9 - 3.11 are supported.
Python should be present on the system. Currently, Python 3.10 - 3.12 are supported.
To install Logprep you have following options:

**1. Option:** Installation via PyPI:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.black]
line-length = 100
target-version = ['py39', 'py310', 'py311']
target-version = ['py310', 'py311', 'py312]
[tool.isort]
profile = "black"
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ hyperscan>=0.4.0; sys_platform == 'linux' and platform_machine == 'x86_64'
jsonref
luqum
mysql-connector-python
numpy>=1.24.1
numpy>=1.26.0
opensearch-py
prometheus_client
protobuf>=3.20.2
Expand Down
Loading

0 comments on commit ff86e38

Please sign in to comment.