diff --git a/.github/workflows/playbook-test.yml b/.github/workflows/playbook-test.yml index ddd1b9ad297..1f50a583a2b 100644 --- a/.github/workflows/playbook-test.yml +++ b/.github/workflows/playbook-test.yml @@ -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 diff --git a/.github/workflows/syntax-test.yml b/.github/workflows/syntax-test.yml index 26457ab0435..b8a3b154241 100644 --- a/.github/workflows/syntax-test.yml +++ b/.github/workflows/syntax-test.yml @@ -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 diff --git a/playbooks/roles/aws/templates/requirements.txt.j2 b/playbooks/roles/aws/templates/requirements.txt.j2 index 9b82e119475..d01afadca37 100644 --- a/playbooks/roles/aws/templates/requirements.txt.j2 +++ b/playbooks/roles/aws/templates/requirements.txt.j2 @@ -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 @@ -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 diff --git a/requirements.txt b/requirements.txt index 1d33e508c2f..cff7b1098dd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,11 +4,11 @@ # # 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 @@ -16,27 +16,27 @@ bcrypt==3.1.7 # 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 @@ -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 @@ -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 @@ -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 diff --git a/requirements/base.in b/requirements/base.in index b1dd2de894d..c1758ed9b02 100644 --- a/requirements/base.in +++ b/requirements/base.in @@ -1,7 +1,7 @@ -c constraints.txt # Standard dependencies for Ansible runs -ansible<3.0.0 +ansible<12.0.0 awscli boto boto3 @@ -9,11 +9,11 @@ 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 diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index db6c4632290..5461e4357ec 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -6,9 +6,9 @@ # 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 @@ -16,7 +16,7 @@ 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: diff --git a/requirements/pip.txt b/requirements/pip.txt index 4996fad1d98..de73c8cb958 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,7 +4,7 @@ # # 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: @@ -12,5 +12,5 @@ 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 diff --git a/tests/test_playbooks.sh b/tests/test_playbooks.sh index 52e4b3abafc..e278060500c 100755 --- a/tests/test_playbooks.sh +++ b/tests/test_playbooks.sh @@ -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="." diff --git a/util/elasticsearch/requirements.txt b/util/elasticsearch/requirements.txt index 6ff7f4c8a67..215b5e31426 100644 --- a/util/elasticsearch/requirements.txt +++ b/util/elasticsearch/requirements.txt @@ -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 diff --git a/util/jenkins/requirements-cloudflare.txt b/util/jenkins/requirements-cloudflare.txt index 4ffb7829ef6..62536e77e7b 100644 --- a/util/jenkins/requirements-cloudflare.txt +++ b/util/jenkins/requirements-cloudflare.txt @@ -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 diff --git a/util/jenkins/requirements.txt b/util/jenkins/requirements.txt index bb478ac3bc2..39ef4daac28 100644 --- a/util/jenkins/requirements.txt +++ b/util/jenkins/requirements.txt @@ -4,11 +4,11 @@ # # 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 @@ -16,22 +16,22 @@ 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 @@ -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 @@ -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 @@ -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 diff --git a/util/pingdom/requirements.txt b/util/pingdom/requirements.txt index 112001f021d..b06356547ae 100644 --- a/util/pingdom/requirements.txt +++ b/util/pingdom/requirements.txt @@ -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 @@ -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 diff --git a/util/vpc-tools/requirements.txt b/util/vpc-tools/requirements.txt index 2864e9dd1a5..ea3b8b9b619 100644 --- a/util/vpc-tools/requirements.txt +++ b/util/vpc-tools/requirements.txt @@ -6,9 +6,9 @@ # boto==2.49.0 # via -r requirements/vpc-tools.in -certifi==2024.8.30 +certifi==2024.12.14 # via requests -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 # via requests docopt==0.6.2 # via -r requirements/vpc-tools.in @@ -16,5 +16,5 @@ idna==3.10 # via requests requests==2.32.3 # via -r requirements/vpc-tools.in -urllib3==2.2.3 +urllib3==2.3.0 # via requests