Merge pull request #1 from sagemath/fix-32bit-tests

add 32bit github tests and fix failures

Author: Jonathan Kliem

Diff for: .github/workflows/main.yml

@@ -15,7 +15,13 @@ jobs:
             fail-fast: false
             matrix:
                 os: [ubuntu-latest, macos-latest, windows-latest]
-                python-version: [3.6, 3.7, 3.8, 3.9]
+                python-version: [3.6, 3.7, 3.8, 3.9, 3.10.0-rc.2]
+                architecture: [x64, x86]
+                exclude:
+                    - os: ubuntu-latest
+                      architecture: x86
+                    - os: macos-latest
+                      architecture: x86
         steps:
         - name: Set up the repository
           uses: actions/checkout@v2
@@ -26,6 +32,7 @@ jobs:
           uses: actions/setup-python@v2
           with:
             python-version: ${{ matrix.python-version }}
+            architecture: ${{ matrix.architecture }}
         - name: Install dependencies
           run: |
               python -m pip install --upgrade pip
@@ -36,5 +43,5 @@ jobs:
         - name: Local build
           run: |
             python setup.py build_ext -i
-            python test.py
+            python test.py || exit 1
             git clean -xfd

Diff for: README.md

@@ -16,3 +16,9 @@ It provides a single extension class `MemoryAllocator` with `cdef` methods
 
 Memory is freed when the instance of `MemoryAllocator` is deallocated.
 On failure to allocate the memory, a proper error is raised.
+
+# Changelog
+
+## 0.1.1
+
+- Fixed doctests on 32bit systems.

Diff for: cydoctest.py

@@ -60,6 +60,6 @@ def testmod(m=None, *args, **kwargs):
     All other arguments are passed directly to doctest.testmod().
     """
     fix_module_doctest(m)
-    result = doctest.testmod(m, *args, **kwargs)
+    result = doctest.testmod(m, optionflags=doctest.ELLIPSIS, *args, **kwargs)
     if result.failed > 0:
         sys.exit('%d test(s) failed' % result.failed)

Diff for: memory_allocator/test.pyx

@@ -14,10 +14,10 @@ cdef class TestMemoryAllocator():
         >>> from memory_allocator.test import TestMemoryAllocator
         >>> mem = TestMemoryAllocator()
         >>> _ = mem.malloc(100)
-        >>> mem.malloc(2**63)
+        >>> mem.malloc(mem.size_t_max())
         Traceback (most recent call last):
         ...
-        MemoryError: failed to allocate 9223372036854775808 bytes
+        MemoryError: failed to allocate ... bytes
         """
         return <size_t> self.mem.malloc(size)
 
@@ -28,10 +28,10 @@ cdef class TestMemoryAllocator():
         >>> from memory_allocator.test import TestMemoryAllocator
         >>> mem = TestMemoryAllocator()
         >>> _ = mem.calloc(100, 10)
-        >>> mem.calloc(2**63, 1)
+        >>> mem.calloc(mem.size_t_max(), 1)
         Traceback (most recent call last):
         ...
-        MemoryError: failed to allocate 9223372036854775808 * 1 bytes
+        MemoryError: failed to allocate ... * 1 bytes
         """
         return <size_t> self.mem.calloc(nmemb, size)
 
@@ -42,10 +42,10 @@ cdef class TestMemoryAllocator():
         >>> from memory_allocator.test import TestMemoryAllocator
         >>> mem = TestMemoryAllocator()
         >>> _ = mem.allocarray(100, 10)
-        >>> mem.allocarray(2**63, 1)
+        >>> mem.allocarray(mem.size_t_max(), 1)
         Traceback (most recent call last):
         ...
-        MemoryError: failed to allocate 9223372036854775808 * 1 bytes
+        MemoryError: failed to allocate ... * 1 bytes
         """
         return <size_t> self.mem.allocarray(nmemb, size)
 
@@ -142,3 +142,6 @@ cdef class TestMemoryAllocator():
 
     def size(self):
         return self.mem.size
+
+    def size_t_max(self):
+        return <size_t> -1

Diff for: setup.py

@@ -26,7 +26,7 @@ def run(self):
 
 setup(
     name='memory_allocator',
-    version='0.1.0',
+    version='0.1.1',
     description='An extension class to allocate memory easily with cython',
     long_description=long_description,
     long_description_content_type='text/markdown',