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

Jump to bottom

Drop EL6 support and clean up #161

Merged
merged 4 commits into from
Jul 16, 2024
Merged

Drop EL6 support and clean up #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d61aec2
drop EL6 support
evgeni Jul 15, 2024
c63278b
drop last bits of EL5 testing
evgeni Jul 15, 2024
3363122
always test tracer
evgeni Jul 15, 2024
ae696c2
drop simplejson support -- Python has native json these days
evgeni Jul 16, 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
1 change: 0 additions & 1 deletion .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jobs:
- images/Dockerfile.el9
- images/Dockerfile.el8
- images/Dockerfile.el7
- images/Dockerfile.el6
- images/Dockerfile.f34
- images/Dockerfile.f33
- images/Dockerfile.suseLeap42
Expand Down
3 changes: 0 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
RHEL5=$(shell grep -q -i 'release 5' /etc/redhat-release 2>/dev/null || false)
PYTHON3=$(shell which python3 && which pip3)
USE_SELINUX=$(shell test -d /sys/fs/selinux && echo ":Z")
DOCKERFILE ?= $(CURDIR)/images/Dockerfile.el9
Expand Down Expand Up @@ -44,9 +43,7 @@ install:
cd src/ && $(PYTHON) setup.py install

test-install:
ifeq ($(RHEL5),) # no pip for RHEL5
$(PIP) install -r test-requirements.txt --user
endif

test: test-install
$(PYTHON) test/unittest_suite.py
Expand Down
11 changes: 0 additions & 11 deletions images/Dockerfile.el6
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions src/katello/repos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@

from rhsm.connection import GoneException, RemoteServerException

try:
import json
except ImportError:
import simplejson as json
import json


def error_message(msg):
Expand Down
5 changes: 1 addition & 4 deletions test/test_katello/test_repos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
try:
import json
except ImportError:
import simplejson as json
import json
import os
import sys

Expand Down
6 changes: 1 addition & 5 deletions test/test_runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ fi;

make install

if grep -q -i 'release 5' /etc/redhat-release; then
python ./test/unittest_suite.py
else
make test
fi
make test

if [ ${PYTHON} = "python3" ]; then
# don't fail on flake8 for now
Expand Down
7 changes: 2 additions & 5 deletions test/unittest_suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
'test_katello.test_enabled_report',
'test_katello.test_packages',
'test_katello.test_repos',
'test_katello.test_tracer',
'test_katello.test_utils'
]

Expand All @@ -23,14 +24,10 @@
modules.append('zypper_plugins.test_enabled_repos_upload')
modules.append('zypper_plugins.test_package_upload')
modules.append('zypper_plugins.test_tracer_upload')
modules.append('test_katello.test_tracer')
modules.append('test_katello.test_tracer.test_zypper')
else:
modules.append('test_yum_plugins.test_enabled_repos_upload')

if sys.version_info[1] > 6:
modules.append('test_katello.test_tracer')
modules.append('test_katello.test_tracer.test_deb')
modules.append('test_katello.test_tracer.test_deb')

map(__import__, modules)

Expand Down
Loading