fix CI

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 526e795b0c9acc2f4b7b633c3c064f1a77e53fa1..58b21d4e4c265f9827b40a497a158a19fc58b3c5 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -48,13 +48,14 @@ build:
         - ccache --show-stats || true
         - python3 -m venv --system-site-packages .venv
         - . .venv/bin/activate
-        - pip install pytest-xdist==3.3.1 pytest==7.3.1 twine cython
+        - pip install pytest-xdist==3.3.1 pytest==7.3.1
     script:
         - . .venv/bin/activate
 
         - IEEE754FPU_PATH="$(pwd)"
         - git clone --depth 1 --recursive -b v0.6.0 https://github.com/billzorn/sfpy.git sfpy
         - pushd sfpy
+        - git apply "$IEEE754FPU_PATH"/sfpy.patch
         - pushd berkeley-softfloat-3
         - git apply "$IEEE754FPU_PATH"/berkeley-softfloat.patch
         - popd
@@ -62,6 +63,7 @@ build:
         - git apply ../softposit_sfpy_build.patch
         - git apply "$IEEE754FPU_PATH"/SoftPosit.patch
         - popd
+        - pip install -r requirements.txt
         - make lib -j$(nproc)
         - make cython -j$(nproc)
         - make wheel -j$(nproc)

diff --git a/README.md b/README.md
index f7051e1e7e570dea91c32e4ab69f86e91d8d5a99..12c321402366d6a66e40967ce2ac46bebd8682a3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -30,6 +30,11 @@ IEEE754 FP emulation being tested.  This FPU is emulating RISC-V, and
 there is some weirdness in x86 IEEE754 implementations when it comes
 to FP16 non-canonical NaNs.
 
+The following modifications are required to sfpy:
+
+    cd /path/to/sfpy
+    git apply /path/to/ieee754fpu/sfpy.patch
+
 The following modifications are required to the sfpy berkeley-softfloat-3
 submodule:
 

diff --git a/sfpy.patch b/sfpy.patch
new file mode 100644 (file)
index 0000000..4c1014f
--- /dev/null
+++ b/sfpy.patch
@@ -0,0 +1,10 @@
+diff --git a/requirements.txt b/requirements.txt
+index 41fa4f6..0e9adef 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -2,4 +2,4 @@ pip
+ wheel
+ twine
+ keyring
+-cython
++cython~=0.29.2