Skip to content
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

chore: updated python version to 3.11 #152

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
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/playbook-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.9]
python-version: [3.11]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/syntax-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.9]
python-version: [3.11]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install Dependencies
Expand Down
13 changes: 8 additions & 5 deletions playbooks/roles/aws/templates/requirements.txt.j2
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# make upgrade
#
awscli==1.35.20
awscli==1.36.38
# via -r requirements/aws.in
boto==2.49.0
# via -r requirements/aws.in
boto3==1.35.54
boto3==1.35.97
# via -r requirements/aws.in
botocore==1.35.54
botocore==1.35.97
# via
# awscli
# boto3
Expand Down Expand Up @@ -39,10 +39,13 @@ rsa==4.7.2
# via awscli
s3cmd==2.4.0
# via -r requirements/aws.in
s3transfer==0.10.3
s3transfer==0.10.4
# via
# awscli
# boto3
six==1.16.0
six==1.17.0
# via python-dateutil
urllib3==1.26.18
# via
# -r requirements/aws.in
# botocore
45 changes: 25 additions & 20 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,39 @@
#
# make upgrade
#
ansible==2.10.7
ansible==11.1.0
# via -r requirements/base.in
ansible-base==2.10.17
ansible-core==2.18.1
# via ansible
awscli==1.35.20
awscli==1.36.38
# via -r requirements/base.in
bcrypt==3.1.7
# via
# -c requirements/constraints.txt
# paramiko
boto==2.49.0
# via -r requirements/base.in
boto3==1.35.54
boto3==1.35.97
# via -r requirements/base.in
botocore==1.35.54
botocore==1.35.97
# via
# awscli
# boto3
# s3transfer
certifi==2024.8.30
certifi==2024.12.14
# via requests
cffi==1.17.1
# via
# bcrypt
# cryptography
# pynacl
charset-normalizer==3.4.0
charset-normalizer==3.4.1
# via requests
colorama==0.4.6
# via awscli
cryptography==43.0.3
cryptography==44.0.0
# via
# ansible-base
# ansible-core
# paramiko
datadog==0.8.0
# via -r requirements/base.in
Expand All @@ -52,10 +52,10 @@ ecdsa==0.13.3
# via -r requirements/base.in
idna==3.10
# via requests
jinja2==2.8
jinja2==3.1.5
# via
# -r requirements/base.in
# ansible-base
# ansible-core
jmespath==1.0.1
# via
# boto3
Expand All @@ -68,18 +68,16 @@ mysqlclient==1.4.6
# via -r requirements/base.in
networkx==1.11
# via -r requirements/base.in
packaging==24.1
# via ansible-base
paramiko==2.4.2
packaging==24.2
# via ansible-core
paramiko==2.12.0
# via -r requirements/base.in
pathlib2==2.3.0
# via -r requirements/base.in
prettytable==0.7.2
# via -r requirements/base.in
pyasn1==0.6.1
# via
# paramiko
# rsa
# via rsa
pycparser==2.22
# via cffi
pycryptodome==3.21.0
Expand All @@ -93,21 +91,28 @@ python-dateutil==2.9.0.post0
pyyaml==6.0.2
# via
# -r requirements/base.in
# ansible-base
# ansible-core
# awscli
requests==2.32.3
# via
# -r requirements/base.in
# datadog
resolvelib==1.0.1
# via ansible-core
rsa==4.7.2
# via awscli
s3transfer==0.10.3
s3transfer==0.10.4
# via
# awscli
# boto3
six==1.16.0
six==1.17.0
# via
# bcrypt
# paramiko
# pathlib2
# python-dateutil
urllib3==1.26.18
# via
# -r requirements/base.in
# botocore
# requests
6 changes: 3 additions & 3 deletions requirements/base.in
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
-c constraints.txt
# Standard dependencies for Ansible runs

ansible<3.0.0
ansible<12.0.0
awscli
boto
boto3
urllib3==1.26.18
datadog==0.8.0
docopt==0.6.2
ecdsa==0.13.3
Jinja2==2.8
jinja2>=3.0
markupsafe==2.0.1 # Pining this until we upgrade jinja2, as in newer version on markupsafe soft_unicode is removed and jinja2==2.8 use this pkg
mysqlclient==1.4.6 # Needed for the mysql_db module, 1,4,6 is the newest version that support python 2 which we really need to stop using
networkx==1.11
paramiko==2.4.2
paramiko==2.12.0
pathlib2==2.3.0
prettytable==0.7.2
pycryptodome
Expand Down
6 changes: 3 additions & 3 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
#
build==1.2.2.post1
# via pip-tools
click==8.1.7
click==8.1.8
# via pip-tools
packaging==24.1
packaging==24.2
# via build
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.2.0
# via
# build
# pip-tools
wheel==0.44.0
wheel==0.45.1
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
4 changes: 2 additions & 2 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# make upgrade
#
wheel==0.44.0
wheel==0.45.1
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.2
# via
# -c requirements/common_constraints.txt
# -r requirements/pip.in
setuptools==75.3.0
setuptools==75.8.0
# via -r requirements/pip.in
9 changes: 8 additions & 1 deletion tests/test_playbooks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,14 @@ ansible-playbook -i localhost, --syntax-check syntax-check-test.yml

output_dir="$PWD/test_output/env-dep"
mkdir -p $output_dir
ansible-playbook -i localhost, -c local --tags "common_directories,edxapp_cfg" edxapp.yml -e edxapp_user=`whoami` -e edxapp_app_dir=$output_dir -e edxapp_code_dir=$output_dir -e EDXAPP_EDXAPP_SECRET_KEY='DUMMY KEY'
ansible-playbook -i localhost, -c local \
--tags "common_directories,edxapp_cfg" \
edxapp.yml \
-e edxapp_user=`whoami` \
-e edxapp_app_dir=$output_dir \
-e edxapp_code_dir=$output_dir \
-e EDXAPP_EDXAPP_SECRET_KEY='DUMMY KEY' \
-e ansible_become=false

root_dir=$output_dir
environment_deployments="."
Expand Down
2 changes: 1 addition & 1 deletion util/elasticsearch/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ deepdiff==3.1.0
# via -r requirements/elasticsearch.in
elasticsearch==0.4.5
# via -r requirements/elasticsearch.in
jsonpickle==3.3.0
jsonpickle==4.0.1
# via deepdiff
urllib3==1.26.20
# via elasticsearch
8 changes: 4 additions & 4 deletions util/jenkins/requirements-cloudflare.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
#
# make upgrade
#
certifi==2024.8.30
certifi==2024.12.14
# via requests
charset-normalizer==3.4.0
charset-normalizer==3.4.1
# via requests
click==8.1.7
click==8.1.8
# via -r requirements/cloudflare.in
idna==3.10
# via requests
requests==2.32.3
# via -r requirements/cloudflare.in
urllib3==2.2.3
urllib3==2.3.0
# via requests
27 changes: 16 additions & 11 deletions util/jenkins/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@
#
# make upgrade
#
amqp==5.2.0
amqp==5.3.1
# via kombu
argcomplete==3.5.1
argcomplete==3.5.3
# via yq
awscli==1.35.20
awscli==1.36.38
# via -r requirements/jenkins.in
backoff==1.4.3
# via -r requirements/jenkins.in
billiard==4.2.1
# via celery
boto==2.49.0
# via -r requirements/jenkins.in
boto3==1.35.54
boto3==1.35.97
# via -r requirements/jenkins.in
botocore==1.35.54
botocore==1.35.97
# via
# awscli
# boto3
# s3transfer
celery==5.4.0
# via -r requirements/jenkins.in
certifi==2024.8.30
certifi==2024.12.14
# via
# opsgenie-sdk
# requests
charset-normalizer==3.4.0
charset-normalizer==3.4.1
# via requests
click==8.1.7
click==8.1.8
# via
# -r requirements/jenkins.in
# celery
Expand Down Expand Up @@ -72,7 +72,7 @@ python-dateutil==2.9.0.post0
# celery
# opsgenie-sdk
# s3cmd
python-gnupg==0.5.3
python-gnupg==0.5.4
# via -r requirements/jenkins.in
python-magic==0.4.27
# via s3cmd
Expand All @@ -91,11 +91,11 @@ rsa==4.7.2
# via awscli
s3cmd==2.4.0
# via -r requirements/jenkins.in
s3transfer==0.10.3
s3transfer==0.10.4
# via
# awscli
# boto3
six==1.16.0
six==1.17.0
# via
# opsgenie-sdk
# python-dateutil
Expand All @@ -108,6 +108,11 @@ tzdata==2024.2
# celery
# kombu
urllib3==1.26.18
# via
# -r requirements/jenkins.in
# botocore
# opsgenie-sdk
# requests
vine==5.1.0
# via
# amqp
Expand Down
6 changes: 3 additions & 3 deletions util/pingdom/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#
# make upgrade
#
certifi==2024.8.30
certifi==2024.12.14
# via requests
charset-normalizer==3.4.0
charset-normalizer==3.4.1
# via requests
click==6.7
# via -r requirements/pingdom.in
Expand All @@ -18,5 +18,5 @@ requests==2.32.3
# via -r requirements/pingdom.in
six==1.14.0
# via -r requirements/pingdom.in
urllib3==2.2.3
urllib3==2.3.0
# via requests
Loading
Loading