Skip to content

update python to 3.13.0 #5552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/auto-instrumentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ concurrency:
cancel-in-progress: true

env:
PYTHON_VERSION: '3.11'
PIP_VERSION: '22.0.4'
PYTHON_VERSION: '3.13'
PIP_VERSION: '24.2'
REQUIREMENTS_PATH: "packaging/tests/requirements.txt"
GO_VERSION: 1.22.7

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/installer-script-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
matrix: ${{ fromJSON(needs.installer-test-matrix.outputs.matrix) }}
fail-fast: false
env:
PYTHON_VERSION: '3.11'
PIP_VERSION: '22.0.4'
PYTHON_VERSION: '3.13'
PIP_VERSION: '24.2'
REQUIREMENTS_PATH: "packaging/tests/requirements.txt"
steps:
- name: Check out the codebase.
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux-package-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ concurrency:
cancel-in-progress: true

env:
PYTHON_VERSION: '3.11'
PIP_VERSION: '22.0.4'
PYTHON_VERSION: '3.13'
PIP_VERSION: '24.2'
REQUIREMENTS_PATH: "packaging/tests/requirements.txt"
GO_VERSION: 1.22.7

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/puppet-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ concurrency:
cancel-in-progress: true

env:
PYTHON_VERSION: "3.11"
PYTHON_VERSION: "3.13"
REQUIREMENTS_PATH: "packaging/tests/requirements.txt"

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/salt-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ concurrency:
cancel-in-progress: true

env:
PYTHON_VERSION: '3.11'
PYTHON_VERSION: '3.13'
REQUIREMENTS_PATH: "packaging/tests/requirements.txt"

jobs:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@

- (Splunk) Add [chrony receiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/chronyreceiver) ([#5535](https://github.com/signalfx/splunk-otel-collector/pull/5535))

### 💡 Enhancements 💡

- (Splunk) Update Python to 3.13.0 ([#](https://github.com/signalfx/splunk-otel-collector/pull/))
## v0.111.0


Expand Down
26 changes: 13 additions & 13 deletions packaging/bundle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
ARG ARCH=amd64
ARG JDK_VERSION=11.0.25_9
ARG MAVEN_VERSION=3.6.0
ARG PYTHON_VERSION=3.12.7
ARG PYTHON_VERSION=3.13.0
ARG PIP_VERSION=24.2
ARG COLLECTD_VERSION=5.8.0-sfx0
ARG COLLECTD_COMMIT=4d3327b14cf4359029613baf4f90c4952702105e
Expand Down Expand Up @@ -169,7 +169,7 @@ RUN wget -nv -O /tmp/Python-${PYTHON_VERSION}.tgz https://www.python.org/ftp/pyt
make -j`nproc` && make install libinstall && \
ldconfig

RUN rm -rf /usr/local/lib/python3.12/test /usr/local/lib/python3.12/unittest
RUN rm -rf /usr/local/lib/python3.13/test /usr/local/lib/python3.13/unittest

RUN rm -rf /tmp/Python*

Expand Down Expand Up @@ -267,9 +267,9 @@ RUN DISABLE_XENCPU=""; if [ "$ARCH" = "ppc64le" ]; then DISABLE_XENCPU="--disabl
--disable-silent-rules \
--disable-static \
--with-java=${JAVA_HOME} \
LIBPYTHON_LDFLAGS="$(python3.12-config --ldflags) -lpython3.12" \
LIBPYTHON_CPPFLAGS="$(python3.12-config --includes)/cpython" \
LIBPYTHON_LIBS="$(python3.12-config --libs) -lpython3.12"
LIBPYTHON_LDFLAGS="$(python3.13-config --ldflags) -lpython3.13" \
LIBPYTHON_CPPFLAGS="$(python3.13-config --includes)/cpython" \
LIBPYTHON_LIBS="$(python3.13-config --libs) -lpython3.13"

# Compile all of collectd first, including plugins
RUN make -j`nproc` &&\
Expand Down Expand Up @@ -318,15 +318,15 @@ RUN /usr/local/bin/python3 -m pip list
# Remove pip to avoid usage in python monitor and in exec'd container
RUN /usr/local/bin/python3 -m pip uninstall pip -y
# Delete all bundled wheels
RUN find /usr/local/lib/python3.12 -name "*.whl" -delete
RUN find /usr/local/lib/python3.13 -name "*.whl" -delete

# Delete all compiled python to save space
RUN find /usr/local/lib/python3.12 -name "*.pyc" -o -name "*.pyo" | xargs rm
RUN find /usr/local/lib/python3.13 -name "*.pyc" -o -name "*.pyo" | xargs rm
# We don't support compiling extension modules so don't need this directory
RUN rm -rf /usr/local/lib/python3.12/config-*-linux-gnu
RUN rm -rf /usr/local/lib/python3.13/config-*-linux-gnu

RUN find /usr/local/lib/python3.12 -type d -name __pycache__ | xargs rm -rf {} \;
RUN find /usr/local/lib/python3.12 -wholename "*test*.key" -delete -or -wholename "*test*.pem" -delete
RUN find /usr/local/lib/python3.13 -type d -name __pycache__ | xargs rm -rf {} \;
RUN find /usr/local/lib/python3.13 -wholename "*test*.key" -delete -or -wholename "*test*.pem" -delete


######## Extra packages that don't make sense to pull down in any other stage ########
Expand Down Expand Up @@ -372,9 +372,9 @@ RUN mkdir -p /opt/root/bin &&\
COPY --from=collectd /usr/local/bin/patchelf /usr/bin/

# Gather Python dependencies
COPY --from=python-plugins /usr/local/lib/python3.12 /opt/root/lib/python3.12
COPY --from=python-plugins /usr/local/lib/libpython3.12.so.1.0 /opt/root/lib
COPY --from=python-plugins /usr/local/bin/python3.12 /opt/root/bin/python
COPY --from=python-plugins /usr/local/lib/python3.13 /opt/root/lib/python3.13
COPY --from=python-plugins /usr/local/lib/libpython3.13.so.1.0 /opt/root/lib
COPY --from=python-plugins /usr/local/bin/python3.13 /opt/root/bin/python

# Gather compiled collectd plugin libraries
COPY --from=collectd /usr/sbin/collectd /opt/root/bin/collectd
Expand Down
2 changes: 1 addition & 1 deletion packaging/bundle/scripts/windows/bundle.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ $repoDir = "$scriptDir\..\..\..\.."
. $scriptDir\common.ps1

$BUILD_DIR="$repoDir\build"
$PYTHON_VERSION="3.12.7"
$PYTHON_VERSION="3.13.0"
$PIP_VERSION="24.2"
$NUGET_URL="https://aka.ms/nugetclidl"
$NUGET_EXE="nuget.exe"
Expand Down
Loading