Skip to content

[DEVTOOLING-1326] WAIT BEFORE MERGE Update to Python 3.10 and update urllib3 version #1108

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[DEVTOOLING-1326] WAIT BEFORE MERGE Update to Python 3.10 and update urllib3 version #1108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions resources/sdk/purecloudpython/scripts/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,20 @@ cp $TESTS_DIR/setup.cfg $BUILD_DIR/setup.cfg

# Compile module
cd $BUILD_DIR
python3.9 -m pip install --user -U urllib3==1.26.20
python3.9 setup.py build
python3.10 setup.py build

# Run tests
echo "Running tests"
cd "$TESTS_DIR"
echo "Install requests..."
python3.9 -m pip install --user -U requests
python3.10 -m pip install --user -U requests
echo "Install watchdog..."
python3.9 -m pip install --user -U watchdog
python3.10 -m pip install --user -U watchdog
echo "Install retry..."
python3.9 -m pip install --user -U retry
python3.10 -m pip install --user -U retry
echo "Run unit tests -> SdkTests"
python3.9 -m unittest SdkTests
python3.10 -m unittest SdkTests
echo "Run unit tests mtls"
python3.9 -m unittest SdkTests_mtls
python3.10 -m unittest SdkTests_mtls
echo "Run unit tests proxy"
python3.9 -m unittest SdkTests_proxy
python3.10 -m unittest SdkTests_proxy
12 changes: 6 additions & 6 deletions resources/sdk/purecloudpython/scripts/publishPyPi-external.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ then
fi

echo "Upgrading PIP"
python3.9 -m pip install --upgrade --user pip
python3.10 -m pip install --upgrade --user pip

echo "Installing Twine and Wheel"
python3.9 -m pip install twine wheel setuptools --user --upgrade
python3.10 -m pip install twine wheel setuptools --user --upgrade

echo "Creating the distribution package"
python3.9 setup.py sdist bdist_wheel
python3.10 setup.py sdist bdist_wheel

echo "Running twine check"
python3.9 -m twine check dist/*
python3.10 -m twine check dist/*

echo "uploading to the pypi test server"
python3.9 -m twine upload --repository-url https://test.pypi.org/legacy/ dist/* -u __token__ -p $DEVTOOLING_SDK_PYPI_TEST
python3.10 -m twine upload --repository-url https://test.pypi.org/legacy/ dist/* -u __token__ -p $DEVTOOLING_SDK_PYPI_TEST

echo "uploading to the pypi prod server"
python3.9 -m twine upload --verbose --repository-url https://upload.pypi.org/legacy/ dist/* -u __token__ -p $DEVTOOLING_SDK_PYPI_PROD
python3.10 -m twine upload --verbose --repository-url https://upload.pypi.org/legacy/ dist/* -u __token__ -p $DEVTOOLING_SDK_PYPI_PROD
10 changes: 5 additions & 5 deletions resources/sdk/purecloudpython/scripts/publishPyPi-internal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ then
fi

echo "Upgrading PIP"
python3.9 -m pip install --upgrade --user pip
python3.10 -m pip install --upgrade --user pip

echo "Installing Twine and Wheel"
python3.9 -m pip install twine wheel setuptools --user --upgrade
python3.10 -m pip install twine wheel setuptools --user --upgrade

echo "Creating the distribution package"
python3.9 setup.py sdist
python3.10 setup.py sdist

echo "Running twine check"
python3.9 -m twine check dist/*
python3.10 -m twine check dist/*

echo "uploading to the pypi server"
python3.9 -m twine upload --repository $INDEX_SERVER dist/*
python3.10 -m twine upload --repository $INDEX_SERVER dist/*
12 changes: 6 additions & 6 deletions resources/sdk/purecloudpython/scripts/publishPyPi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ then
fi

echo "Upgrading PIP"
python3.9 -m pip install --upgrade --user pip
python3.10 -m pip install --upgrade --user pip

echo "Installing Twine and Wheel"
python3.9 -m pip install twine wheel setuptools --user --upgrade
python3.10 -m pip install twine wheel setuptools --user --upgrade

echo "Creating the distribution package"
python3.9 setup.py sdist bdist_wheel
python3.10 setup.py sdist bdist_wheel

echo "Running twine check"
python3.9 -m twine check dist/*
python3.10 -m twine check dist/*

echo "uploading to the pypi test server"
python3.9 -m twine upload --verbose --repository-url https://test.pypi.org/legacy/ dist/* -u __token__ -p $DEVTOOLING_SDK_PYPI_TEST
python3.10 -m twine upload --verbose --repository-url https://test.pypi.org/legacy/ dist/* -u __token__ -p $DEVTOOLING_SDK_PYPI_TEST

echo "uploading to the pypi prod server"
python3.9 -m twine upload --verbose --repository-url https://upload.pypi.org/legacy/ dist/* -u __token__ -p $DEVTOOLING_SDK_PYPI_PROD
python3.10 -m twine upload --verbose --repository-url https://upload.pypi.org/legacy/ dist/* -u __token__ -p $DEVTOOLING_SDK_PYPI_PROD
2 changes: 1 addition & 1 deletion resources/sdk/purecloudpython/templates/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
certifi >= 2025.01.31
python_dateutil >= 2.9.0.post0
setuptools >= 60.9.3
urllib3 >= 1.26.20
urllib3 >= 2.5.0
watchdog >= 5.0.0
4 changes: 2 additions & 2 deletions resources/sdk/purecloudpython/templates/setup.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ VERSION = "{{packageVersion}}"
# prerequisite: setuptools
# http://pypi.python.org/pypi/setuptools

REQUIRES = ["urllib3 >= 1.26.20", "certifi >= 2025.01.31", "python-dateutil >= 2.9.0.post0", "watchdog >= 5.0.0"]
REQUIRES = ["urllib3 >= 2.5.0", "certifi >= 2025.01.31", "python-dateutil >= 2.9.0.post0", "watchdog >= 5.0.0"]

setup(
name="{{packageName}}",
Expand All @@ -29,5 +29,5 @@ setup(
long_description="{{packageDescription}}",
long_description_content_type="text/plain",
license="MIT",
python_requires=">=3.9"
python_requires=">=3.10"
)
2 changes: 1 addition & 1 deletion resources/sdk/purecloudpython/templates/tox.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py39,py310,py311,py312,py313
envlist = py310,py311,py312,py313,py314

[testenv]
deps=-r{toxinidir}/requirements.txt
Expand Down