Skip to content

Commit

Permalink
[Python 3.9 Upgrade] OpenSearch-Build Repo Python Migration to 3.9 Ve…
Browse files Browse the repository at this point in the history
…rsion (#3658)

Signed-off-by: Peter Zhu <[email protected]>
  • Loading branch information
peterzhuamazon committed Jul 6, 2023
1 parent f7cc5a6 commit 3bf03fc
Show file tree
Hide file tree
Showing 42 changed files with 194 additions and 194 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/manifests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
needs: list-manifests11
runs-on: ubuntu-latest
env:
PYTHON_VERSION: 3.7
PYTHON_VERSION: 3.9
JDK_VERSION: 11
strategy:
matrix:
Expand All @@ -60,7 +60,7 @@ jobs:
needs: list-manifests17
runs-on: ubuntu-latest
env:
PYTHON_VERSION: 3.7
PYTHON_VERSION: 3.9
JDK_VERSION: 17
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- windows-latest
runs-on: ${{ matrix.os }}
env:
PYTHON_VERSION: 3.7
PYTHON_VERSION: 3.9
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ env.PYTHON_VERSION }}
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
python-tests-build-image:
runs-on: ubuntu-latest
container:
image: public.ecr.aws/opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v2
image: public.ecr.aws/opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3
options: --user root
steps:
- uses: actions/checkout@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ jobs:
update:
runs-on: ubuntu-latest
env:
PYTHON_VERSION: 3.7
JDK_VERSION: 14
PYTHON_VERSION: 3.9
JDK_VERSION: 11
steps:
- uses: actions/checkout@v3
- name: Set Up JDK ${{ env.JDK_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/yaml-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
yaml-lint:
runs-on: ubuntu-latest
env:
PYTHON_VERSION: 3.7
PYTHON_VERSION: 3.9
steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ env.PYTHON_VERSION }}
Expand Down
37 changes: 23 additions & 14 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,40 @@ name = "pypi"
[packages]
pyyaml = "~=5.4"
types-PyYAML = "~=5.4"
requests = "~=2.26"
# TODO: The 'requests' package stays on 2.28 until we deprecate CentOS7.
# As newer version requires openssl1.1.1 where CentOS7 only provides openssl1.1.0.
# https://github.com/opensearch-project/opensearch-build/issues/3554
requests = "<=2.28.1"
types-requests = "~=2.25"
pre-commit = "~=2.15.0"
isort = "~=5.9"
flake8 = "~=3.9"
mypy = "~=0.9"
pytest = "*"
# TODO: Newer version of mypy above 0.971 such as 0.991 has included new checks such as 'call-overload', 'override', and 'arg-type'
# that would introduce new errors during the checks. Set this as a later enhancement for now
# https://github.com/opensearch-project/opensearch-build/issues/3704
mypy = "<=0.971"
pytest = "~=7.1.3"
coverage = "~=4.5.4"
pytest-cov = "~=2.10.0"
jproperties = "~=2.1.1"
retry = "~=0.9"
sortedcontainers = "*"
sortedcontainers = "~=2.4.0"
# TODO: pkg_resources is deprecated in Python 3.9 ever since Python 3.8 introduces importlib.metadata
# The latest version of cerberus is still using pkg_resources with this PR pending: https://github.com/pyeve/cerberus/pull/579
# You will see a new deprecation warning when running cerberus related code in this repository: 'DeprecationWarning: pkg_resources is deprecated as an API'
cerberus = "~=1.3.4"
psutil = "~=5.8"
atomicwrites = "*"
validators = "*"
yamlfix = "*"
yamllint = "*"
pytablewriter = "*"
typed-ast = "*"
zipp = "*"
importlib-metadata = "*"
ruamel-yaml = "*"
atomicwrites = "~=1.4.1"
validators = "~=0.20.0"
yamlfix = "~=1.0.1"
yamllint = "~=1.27.1"
pytablewriter = "~=0.64.2"
typed-ast = "~=1.5.4"
zipp = "~=3.8.1"
importlib-metadata = "~=4.12.0"
ruamel-yaml = "~=0.17.21"

[dev-packages]

[requires]
python_version = "3.7"
python_version = "3.9"
Loading

0 comments on commit 3bf03fc

Please sign in to comment.