Skip to content

Commit

Permalink
Bump version of GH actions and python version
Browse files Browse the repository at this point in the history
* bumped version of GH actions
* testing now happens on py312
* fix styling issues
  • Loading branch information
rbikar committed Apr 11, 2024
1 parent de87b97 commit bcae5ad
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 34 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Install RPM
run: |
sudo apt-get install -y rpm
sudo apt-get install -y libkrb5-dev
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: "3.12"
- name: Install Tox
run: pip install tox
- name: Run Tox
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: "3.12"
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
36 changes: 12 additions & 24 deletions .github/workflows/tox-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,58 +3,46 @@ name: Tox tests
on: [push, pull_request]

jobs:
py38:
py312:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
python-version: "3.12"
- name: Install Tox
run: pip install tox
- name: Run Tox
run: tox -e py38
py39:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.9
- name: Install Tox
run: pip install tox
- name: Run Tox
run: tox -e py39
run: tox -e py312
static:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: "3.12"
- name: Install Tox
run: pip install tox
- name: Run Tox
run: tox -e static
coverage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: "3.12"
- name: Install Tox
run: pip install tox
- name: Run Tox
run: tox -e cov
- name: Install pytest cov
run: pip install pytest-cov
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
fail_ci_if_error: true
Expand Down
2 changes: 0 additions & 2 deletions tests/integration/test_association.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,6 @@ def test_ubipop_not_filter_non_module_rpm_and_module_rpm_with_same_package(pulp_

@pytest.mark.skipif(INTEGRATION_NOT_SETUP, reason="Integration test is not set up.")
def test_ubipop_not_filter_module_rpm_with_different_version(pulp_client):

"""
Test if ubipop will not filter module rpm in the repo
Expand Down Expand Up @@ -636,7 +635,6 @@ def test_ubipop_not_filter_module_rpm_with_different_version(pulp_client):

@pytest.mark.skipif(INTEGRATION_NOT_SETUP, reason="Integration test is not set up.")
def test_ubipop_get_dependencies_module_rpm(pulp_client):

"""
Test if ubipop get the dependencies of module
ubipop can get the dependencies of rpm
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py38,py39,static,docs,integration
envlist = py38,py39,py312,static,docs,integration

[testenv]
deps=-rtest-requirements.txt
Expand All @@ -21,7 +21,7 @@ allowlist_externals=yum
[testenv:static]
deps=
-rtest-requirements.txt
black==22.3.0
black==24.3.0
pylint==2.8.3

commands=
Expand Down

0 comments on commit bcae5ad

Please sign in to comment.