Compatibility with Python 3.8, see upstream issue https://github.com/rbarrois/aionotify/pull/15 diff --git a/setup.py b/setup.py index 21a554f..094de64 100755 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ setup( setup_requires=[ ], tests_require=[ - 'asynctest', + 'asynctest; python_version<"3.8"', ], classifiers=[ "Development Status :: 4 - Beta", diff --git a/tests/test_usage.py b/tests/test_usage.py index f156291..0476ff1 100644 --- a/tests/test_usage.py +++ b/tests/test_usage.py @@ -8,7 +8,11 @@ import os.path import tempfile import unittest -import asynctest +try: + testBase = unittest.IsolatedAsyncioTestCase +except AttributeError: + import asynctest + testBase = asynctest.TestCase import aionotify @@ -25,11 +29,13 @@ if AIODEBUG: TESTDIR = os.environ.get('AIOTESTDIR') or os.path.join(os.path.dirname(__file__), 'testevents') -class AIONotifyTestCase(asynctest.TestCase): +class AIONotifyTestCase(testBase): forbid_get_event_loop = True timeout = 3 def setUp(self): + if not getattr (self, 'loop', None): + self.loop = asyncio.get_event_loop() if AIODEBUG: self.loop.set_debug(True) self.watcher = aionotify.Watcher() href='/guix/commit/gnu/image.scm?id=76c18f880c3ee9bde9540e44440f5a2e1dfd4180'>commitdiff
path: root/gnu/image.scm
AgeCommit message (Expand)Author
2020-06-24image: Move hurd image definition to a dedicated file....This moves hurd-disk-image to a dedicated file. It also defines a default operating-system so that the image can be built standalone. * gnu/system/images/hurd.scm: New file, * gnu/local.mk (GNU_SYSTEM_MODULES): add it, * gnu/system/image.scm (root-offset, root-label): Export it, (hurd-disk-image): remove it as this is now defined in the new, Hurd dedicated file above, (find-image): adapt to avoid loop dependency. Mathieu Othacehe
2020-06-13image: Add 'target' support....* gnu/image.scm (<image>)[target]: New field, (image-target): new public method. * gnu/system/image.scm (hurd-disk-image): Set "i586-pc-gnu" as image 'target' field, (maybe-with-target): new procedure, (system-image): honor image 'target' field using the above procedure. Mathieu Othacehe
2020-05-26image: Add partition file-system options support....* gnu/image.scm (<partition>)[file-system-options]: New field, (partition-file-system-options): new exported procedure. * gnu/system/image.scm (partition->gexp): Adapt accordingly. * gnu/build/image.scm (sexp->partition): Also adapt accordingly, (make-ext-image): and pass file-system options to mke2fs. Mathieu Othacehe
2020-05-26image: Set offset default to zero....* gnu/image.scm (<partition>)[offset]: Set to zero by default. * gnu/system/image.scm (system-disk-image): Adapt accordingly. Mathieu Othacehe
2020-05-26image: Add partition offset support....* gnu/image.scm (partition-offset): New procedure, (<partition>)[offset]: new field. * gnu/system/image.scm (system-disk-image): Apply the partition offset. Mathieu Othacehe
2020-05-05image: Add a new API....Raw disk-images and ISO9660 images are created in a Qemu virtual machine. This is quite fragile, very slow, and almost unusable without KVM. For all these reasons, add support for host image generation. This implies the use new image generation mechanisms. - Raw disk images: images of partitions are created using tools such as mke2fs and mkdosfs depending on the partition file-system type. The partition images are then assembled into a final image using genimage. - ISO9660 images: the ISO root directory is populated within the store. GNU xorriso is then called on that directory, in the exact same way as this is done in (gnu build vm) module. Those mechanisms are built upon the new (gnu image) module. * gnu/image.scm: New file. * gnu/system/image.scm: New file. * gnu/build/image: New file. * gnu/local.mk: Add them. * gnu/system/vm.scm (system-disk-image): Rename to system-disk-image-in-vm. * gnu/ci.scm (qemu-jobs): Adapt to new API. * gnu/tests/install.scm (run-install): Ditto. * guix/scripts/system.scm (system-derivation-for-action): Ditto. Mathieu Othacehe