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.

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

Remove py36 build #2057

Closed
wants to merge 2 commits into from
Closed

Remove py36 build #2057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e914bc1
Upgrade C++ test and benchmark workflow python version to 3.8
phoebusm Dec 9, 2024
af98e8e
Remove py36 build
phoebusm Dec 10, 2024
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
9 changes: 7 additions & 2 deletions .github/actions/setup_deps/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ runs:
using: "composite"
steps:
- name: Install deps
id: install_deps
shell: bash -l {0}
run: |
dnf update -y
dnf remove -y 'gcc-toolset-13-*'
dnf install -y zip flex bison gcc-toolset-10 gcc-toolset-10-gdb gcc-toolset-10-libatomic-devel krb5-devel cyrus-sasl-devel openssl-devel \
unzip tar epel-release jq wget libcurl-devel python3 \
python3-devel python3-pip perl-IPC-Cmd
unzip tar epel-release jq wget libcurl-devel \
python38-devel python38-pip perl-IPC-Cmd

dnf groupinstall -y 'Development Tools'

Expand Down Expand Up @@ -41,3 +42,7 @@ runs:

which gcc
which g++
echo "python_in_use=/opt/python/cp38-cp38/bin/python" >> "$GITHUB_OUTPUT"
outputs:
python_in_use:
value: ${{ steps.install_deps.outputs.python_in_use }}
2 changes: 1 addition & 1 deletion .github/workflows/benchmark_commits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
shell: bash -el {0}
run: |
ls /opt/python
echo /opt/python/cp36-cp36m/bin >> $GITHUB_PATH
echo /opt/python/cp38-cp38/bin >> $GITHUB_PATH


- name: Set persistent storage variables
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}}
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}}
arcticdb_version: ["oldest", "latest"]
include:
- python_deps_ids: [""]
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}}
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}}
include:
- python_deps_ids: [""]
matrix_override: ${{fromJson(needs.common_config.outputs.linux_matrix)}}
Expand Down Expand Up @@ -222,7 +222,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[6, 7, 8, 9, 10, 11, 12]')}}
python3: ${{fromJson(vars.LINUX_PYTHON_VERSIONS || '[7, 8, 9, 10, 11, 12]')}}
arcticdb_version: ["oldest", "latest"]
include:
- python_deps_ids: [""]
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build_steps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ jobs:
continue-on-error: true

- name: Install deps
id: install_deps
if: matrix.os == 'linux' && inputs.job_type != 'build-python-wheels'
uses: ./.github/actions/setup_deps

Expand Down Expand Up @@ -146,7 +147,7 @@ jobs:
with:
cmakeListsTxtPath: ${{github.workspace}}/cpp/CMakeLists.txt
configurePreset: ${{env.ARCTIC_CMAKE_PRESET}}
configurePresetAdditionalArgs: "['-DVCPKG_INSTALL_OPTIONS=--clean-after-build']"
configurePresetAdditionalArgs: "['-DVCPKG_INSTALL_OPTIONS=--clean-after-build', '-DPython_EXECUTABLE=${{ steps.install_deps.outputs.python_in_use }}']"
buildPreset: ${{env.ARCTIC_CMAKE_PRESET}}

- name: Compile C++ tests
Expand Down
2 changes: 1 addition & 1 deletion python/tests/util/storage_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def verify_library(ac):


def is_strategy_branch_valid_format(input_string):
pattern = r"^(linux|windows)_cp3(6|7|8|9|10|11|12).*$"
pattern = r"^(linux|windows)_cp3(7|8|9|10|11|12).*$"
match = re.match(pattern, input_string)
return bool(match)

Expand Down
Loading