Skip to content

Commit

Permalink
bumping python to 3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
eamonnfaherty committed Oct 14, 2024
1 parent 959e1e9 commit ede4fcb
Show file tree
Hide file tree
Showing 10 changed files with 553 additions and 517 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.9]
python-version: [3.11]
poetry-version: [1.4.2]
os: [ubuntu-20.04]
runs-on: ${{ matrix.os }}
Expand All @@ -19,8 +19,8 @@ jobs:
with:
poetry-version: ${{ matrix.poetry-version }}
# https://github.com/python-poetry/poetry/issues/4511
- name: setuptools
run: poetry run pip install 'setuptools==65.5.1'
#- name: setuptools
# run: poetry run pip install 'setuptools==65.5.1'
- name: Install
run: make install
- name: run tests
Expand Down
2 changes: 1 addition & 1 deletion Makefile.CI
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## @CI_actions Installs the checked out version of the code to your poetry managed venv
install:
poetry env use 3.9
poetry env use 3.11
poetry install

## @CI_actions Runs code quality checks
Expand Down
2 changes: 1 addition & 1 deletion docs/source/puppet/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ Building locally
----------------

You can build and run this framework locally. There is a Makefile to make this easier for you. In order to run the
Make targets you will need to have python poetry and python 3.7 installed. We recommend using pipx to install poetry.
Make targets you will need to have python poetry and python 3.11 installed. We recommend using pipx to install poetry.

Running ``make help`` will display a description of the targets along with a description of what they do.
1,036 changes: 536 additions & 500 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ issues = "https://github.com/awslabs/aws-service-catalog-puppet-framework/issues
codecov = "^2.1.7"
behave = "^1.2.6"
pylint = "^2.5.3"
black = "^19.10b0"
black = "24.10.0"
pycodestyle = "^2.6.0"
nose2 = "^0.10.0"

Expand All @@ -41,11 +41,11 @@ envs = ["main"]
to = {format = "poetry", path = "pyproject.toml"}

[tool.poetry.dependencies]
python = "^3.9"
python = "^3.11"
requests = "2.32.2"
pyyaml = "6.0.1"
jinja2 = "3.1.4"
click = "==7.0"
click = "8.1.7"
boto3 = "1.26.15"
better-boto = "0.42.0"
terminaltables = "==3.1.0"
Expand Down
2 changes: 1 addition & 1 deletion servicecatalog_puppet/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@
phases:
install:
runtime-versions:
python: 3.9
python: 3.11
commands:
- {}
build:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ Resources:
phases:
install:
runtime-versions:
python: 3.9
python: 3.11
commands:
- pip install ${VERSION}
- servicecatalog-puppet --info set-regions ${ENABLED_REGIONS}
Expand Down Expand Up @@ -484,7 +484,7 @@ Resources:
Role: !GetAtt StartInstallRole.Arn
Handler: "index.handler"
Description: Lambda for starting Puppet CodeBuild Job
Runtime: python3.9
Runtime: python3.11
Timeout: 900
Code:
ZipFile: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ Resources:
phases:
install:
runtime-versions:
python: 3.9
python: 3.11
commands:
- echo $VERSION
- bash -c "if [[ $VERSION =~ 'http' ]]; then pip install $VERSION ; else pip install aws-service-catalog-puppet==$VERSION; fi"
Expand Down
8 changes: 4 additions & 4 deletions servicecatalog_puppet/template_builder/hub/bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ def get_template(
)

install_spec = {
"runtime-versions": dict(python="3.9"),
"runtime-versions": dict(python="3.11"),
"commands": [
f"pip install {puppet_version}"
if "http" in puppet_version
Expand Down Expand Up @@ -831,7 +831,7 @@ def get_template(
version="0.2",
phases={
"install": {
"runtime-versions": {"python": "3.9",},
"runtime-versions": {"python": "3.11",},
"commands": [
f"pip install {puppet_version}"
if "http" in puppet_version
Expand Down Expand Up @@ -1020,7 +1020,7 @@ def get_template(
version=0.2,
phases=dict(
install={
"runtime-versions": dict(python="3.9"),
"runtime-versions": dict(python="3.11"),
"commands": [
f"pip install {puppet_version}"
if "http" in puppet_version
Expand Down Expand Up @@ -1124,7 +1124,7 @@ def get_template(
],
),
Source=codebuild.Source(
BuildSpec="version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.9\n commands:\n - pip install aws-service-catalog-puppet\n build:\n commands:\n - servicecatalog-puppet bootstrap-spokes-in-ou $OU_OR_PATH $IAM_ROLE_NAME $IAM_ROLE_ARNS ${OPTIONS}\nartifacts:\n files:\n - results/*/*\n - output/*/*\n name: BootstrapProject\n",
BuildSpec="version: 0.2\nphases:\n install:\n runtime-versions:\n python: 3.11\n commands:\n - pip install aws-service-catalog-puppet\n build:\n commands:\n - servicecatalog-puppet bootstrap-spokes-in-ou $OU_OR_PATH $IAM_ROLE_NAME $IAM_ROLE_ARNS ${OPTIONS}\nartifacts:\n files:\n - results/*/*\n - output/*/*\n name: BootstrapProject\n",
Type="NO_SOURCE",
),
Description="Bootstrap all the accounts in an OU",
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
'package_data': package_data,
'install_requires': install_requires,
'entry_points': entry_points,
'python_requires': '>=3.9,<4.0',
'python_requires': '>=3.11,<4.0',
}


Expand Down

0 comments on commit ede4fcb

Please sign in to comment.