Update from upstream #11

Closed
soksanichenko wants to merge 158 commits from a8_updated into a8
2 changed files with 16 additions and 15 deletions
Showing only changes of commit 9cd42a2b5e - Show all commits

View File

@ -16,7 +16,6 @@
__all__ = ("create_variant_repo",) __all__ = ("create_variant_repo",)
import copy import copy
import errno import errno
import glob import glob
@ -25,18 +24,20 @@ import shutil
import threading import threading
import xml.dom.minidom import xml.dom.minidom
from kobo.threads import ThreadPool, WorkerThread
from kobo.shortcuts import run, relative_path
from ..wrappers.scm import get_dir_from_scm
from ..wrappers.createrepo import CreaterepoWrapper
from .base import PhaseBase
from ..util import get_arch_variant_data, temp_dir, read_single_module_stream_from_file
from ..module_util import Modulemd, collect_module_defaults
import productmd.rpms
import productmd.modules import productmd.modules
import productmd.rpms
from kobo.shortcuts import relative_path, run
from kobo.threads import ThreadPool, WorkerThread
from ..module_util import Modulemd, collect_module_defaults
from ..util import (
get_arch_variant_data,
read_single_module_stream_from_file,
temp_dir,
)
from ..wrappers.createrepo import CreaterepoWrapper
from ..wrappers.scm import get_dir_from_scm
from .base import PhaseBase
createrepo_lock = threading.Lock() createrepo_lock = threading.Lock()
createrepo_dirs = set() createrepo_dirs = set()

View File

@ -1,24 +1,24 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
try: try:
import unittest2 as unittest import unittest2 as unittest
except ImportError: except ImportError:
import unittest import unittest
import mock
import glob import glob
import os import os
import mock
import six import six
from pungi.module_util import Modulemd
from pungi.phases.createrepo import ( from pungi.phases.createrepo import (
CreaterepoPhase, CreaterepoPhase,
ModulesMetadata,
create_variant_repo, create_variant_repo,
get_productids_from_scm, get_productids_from_scm,
ModulesMetadata,
) )
from tests.helpers import DummyCompose, PungiTestCase, copy_fixture, touch from tests.helpers import DummyCompose, PungiTestCase, copy_fixture, touch
from pungi.module_util import Modulemd
class TestCreaterepoPhase(PungiTestCase): class TestCreaterepoPhase(PungiTestCase):