Skip to content

Commit 6b57e6b

Browse files
[RAA-3605]-[KM]-[upgrade to Python 3.13, update pyproject, CI pipelines, workflows, and setup scripts macos and ubuntu]-[BS]
1 parent bbd5176 commit 6b57e6b

File tree

6 files changed

+39
-126
lines changed

6 files changed

+39
-126
lines changed

.github/workflows/continous-integration-workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
with:
1313
fetch-depth: 0 # This causes all history to be fetched, which is required for calculate-version to function
1414

15-
- name: Install Python 3.10
15+
- name: Install Python 3.13
1616
uses: actions/setup-python@v6
1717
with:
18-
python-version: '3.10'
18+
python-version: '3.13'
1919

2020
- name: Upgrade python packaging tools
2121
run: python -m pip install --upgrade pip setuptools wheel

azure/azure-build-pipeline.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@ resources:
2222

2323
variables:
2424
- template: project.yml
25+
26+
jobs:
27+
- job: SetupPython
28+
steps:
29+
- task: UsePythonVersion@0
30+
inputs:
31+
versionSpec: ${{ variables.python_version }}
32+
2533
extends:
2634
template: azure/common/apigee-build.yml@common
2735
parameters:

poetry.lock

Lines changed: 2 additions & 97 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package-mode = false
2020

2121

2222
[tool.poetry.dependencies]
23-
python = "^3.10"
23+
python = "^3.13"
2424
pyyaml = "^6.0"
2525
docopt = "^0.6.2"
2626
jsonpath-rw = "^1.4.0"

scripts/macos_setup_environment.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,29 +45,29 @@ else
4545
exit 2
4646
fi
4747

48-
# Installing python 3.10.8 with pyenv
49-
echo "Installing python 3.10.8 with pyenv ..."
50-
if pyenv versions | grep -Fq "3.10.8" ; then
51-
echo "Pyenv has already got Python 3.10.8 installed."
48+
# Installing python 3.13 with pyenv
49+
echo "Installing python 3.13 with pyenv ..."
50+
if pyenv versions | grep -Fq "3.13" ; then
51+
echo "Pyenv has already got Python 3.13 installed."
5252
else
53-
if pyenv install 3.10.8 ; then
54-
echo "Pyenv installed Python 3.10.8 successfully."
53+
if pyenv install 3.13 ; then
54+
echo "Pyenv installed Python 3.13 successfully."
5555
else
56-
echo "Pyenv did NOT install Python 3.10.8 successfully."
56+
echo "Pyenv did NOT install Python 3.13 successfully."
5757
exit 3
5858
fi
5959
fi
6060

6161

62-
# Creating Apigee environment with Python 3.10.8
63-
echo "Creating Apigee environment with Python 3.10.8 ..."
62+
# Creating Apigee environment with Python 3.13
63+
echo "Creating Apigee environment with Python 3.13 ..."
6464
if pyenv versions | grep -q ".*apigee" ; then
6565
echo "A Python virtualenv named 'apigee' already exists."
6666
else
67-
if pyenv virtualenv 3.10.8 apigee ; then
68-
echo "A Python 3.10.8 virtualenv named 'apigee' was created."
67+
if pyenv virtualenv 3.13 apigee ; then
68+
echo "A Python 3.13 virtualenv named 'apigee' was created."
6969
else
70-
echo "A Python 3.10.8 virtualenv named 'apigee' was NOT created."
70+
echo "A Python 3.13 virtualenv named 'apigee' was NOT created."
7171
exit 4
7272
fi
7373
fi
@@ -86,7 +86,7 @@ fi
8686
# Checking python version
8787
echo "Checking python version ..."
8888
version=$(python -V 2>&1)
89-
if [[ $version = 'Python 3.10.8' ]] ; then
89+
if [[ $version = 'Python 3.13'* ]] ; then
9090
echo "Python version is correct."
9191
else
9292
echo "Python version is NOT correct."

scripts/ubuntu_setup_environment.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -63,29 +63,29 @@ else
6363
fi
6464

6565

66-
#Installing python 3.10.8 with pyenv
67-
echo "Installing python 3.10.8 with pyenv ..."
68-
if pyenv versions | grep -Fq "3.10.8" ; then
69-
echo "Pyenv has already got Python 3.10.8 installed."
66+
#Installing python 3.13 with pyenv
67+
echo "Installing python 3.13 with pyenv ..."
68+
if pyenv versions | grep -Fq "3.13" ; then
69+
echo "Pyenv has already got Python 3.13 installed."
7070
else
71-
if pyenv install 3.10.8 ; then
72-
echo "Pyenv installed Python 3.10.8 successfully."
71+
if pyenv install 3.13 ; then
72+
echo "Pyenv installed Python 3.13 successfully."
7373
else
74-
echo "Pyenv did NOT install Python 3.10.8 successfully."
74+
echo "Pyenv did NOT install Python 3.13 successfully."
7575
exit 1
7676
fi
7777
fi
7878

7979

80-
#Creating Apigee environment with Python 3.10.8
81-
echo "Creating Apigee environment with Python 3.10.8 ..."
80+
#Creating Apigee environment with Python 3.13
81+
echo "Creating Apigee environment with Python 3.13 ..."
8282
if pyenv versions | grep -q ".*apigee" ; then
8383
echo "A Python virtualenv named 'apigee' already exists."
8484
else
85-
if pyenv virtualenv 3.10.8 apigee ; then
86-
echo "A Python 3.10.8 virtualenv named 'apigee' was created."
85+
if pyenv virtualenv 3.13 apigee ; then
86+
echo "A Python 3.13 virtualenv named 'apigee' was created."
8787
else
88-
echo "A Python 3.10.8 virtualenv named 'apigee' was NOT created."
88+
echo "A Python 3.13 virtualenv named 'apigee' was NOT created."
8989
exit 1
9090
fi
9191
fi
@@ -104,7 +104,7 @@ fi
104104
#Checking python version
105105
echo "Checking python version ..."
106106
version=$(python -V 2>&1)
107-
if [[ $version = 'Python 3.10.8' ]] ; then
107+
if [[ $version = 'Python 3.13'* ]] ; then
108108
echo "Python version is correct."
109109
else
110110
echo "Python version is NOT correct."

0 commit comments

Comments
 (0)