Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -257,12 +257,15 @@ requirements.txt: pyproject.toml
# editable mode (like the one in development here) because they may not have
# a PyPI entry; also print out CVE description and potential fixes if audit
# found an issue.
# Ignore GHSA-4xh5-x5gv-qwph since we are using Python >=3.11.13, which is not vulnerable to this
# CVE. Remove this once a new version of pip that fixes the CVE is released.
# See https://github.com/pypa/pip/issues/13607
.PHONY: audit
audit:
if ! $$(python -c "import pip_audit" &> /dev/null); then \
echo "No package pip_audit installed, upgrade your environment!" && exit 1; \
fi;
python -m pip_audit --skip-editable --desc on --fix --dry-run
python -m pip_audit --skip-editable --desc on --fix --dry-run --ignore-vuln GHSA-4xh5-x5gv-qwph

# Run some or all checks over the package code base.
.PHONY: check check-code check-bandit check-flake8 check-lint check-mypy check-go check-actionlint
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.base
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ enabled=1\
# Exceptions (not installed):
# mcpp - The package mcpp is not available in Oracle Linux 9. However, we don't use Souffle's feature
# that needs it.
# python3 - We use the installed Python3.11.2 for this.
# python3 - We use the installed Python3.11.13 for this.
gcc-c++ \
libffi \
libffi-devel \
Expand Down
2 changes: 1 addition & 1 deletion docs/source/pages/supported_technologies/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Automatic dependency resolution

Currently, we support the following type of project for automatic dependency resolution.

* Python (with a Python virtual environment created and packages installed using Python3.11, see :ref:`providing Python virtual environment <python-venv-deps>`.)
* Python (with a Python virtual environment created and packages installed using Python3.11.13, see :ref:`providing Python virtual environment <python-venv-deps>`.)

--------
See also
Expand Down
2 changes: 1 addition & 1 deletion docs/source/pages/tutorials/detect_malicious_package.rst
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ Macaron supports analyzing a package's dependencies and performs the same set of

Let's assume ``/tmp/.django_venv`` is the virtual environment where ``django@5.0.6`` is installed.

.. note:: If you want Macaron to analyze the virtual environment directly to identify the dependencies, we require Python 3.11 to be used to install the package. Alternatively, you can generate the SBOM as instructed :ref:`here <python-sbom>` and pass it to Macaron as input.
.. note:: If you want Macaron to analyze the virtual environment directly to identify the dependencies, we require Python 3.11.13 to be used to install the package. Alternatively, you can generate the SBOM as instructed :ref:`here <python-sbom>` and pass it to Macaron as input.

Run Macaron as follows to analyze ``django`` and its direct dependencies.

Expand Down
2 changes: 1 addition & 1 deletion docs/source/pages/using.rst
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ Where ``--python-venv`` is the path to virtual environment.

Alternatively, you can create an SBOM for the python package and provide it to Macaron as input as explained :ref:`here <with-sbom>`.

.. note:: We only support Python 3.11 for this feature of Macaron. Please make sure to install the package using this version of Python.
.. note:: We only support Python 3.11.13 for this feature of Macaron. Please make sure to install the package using this version of Python.


-----------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ build-backend = "flit_core.buildapi"

[project]
name = "macaron"
requires-python = ">=3.11"
requires-python = ">=3.11.13"
authors = [
{"name" = "Trong Nhan Mai", "email" = "trong.nhan.mai@oracle.com"},
{"name" = "Behnaz Hassanshahi", "email" = "behnaz.hassanshahi@oracle.com"},
Expand Down
Loading