Change tests a little, show versions of packages in GitHub Actions, use

ubuntu 20.04
ctlab · Dec 1, 2022 · 3ed482c · 3ed482c
1 parent d012e7f
commit 3ed482c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, windows-2019, macos-10.15]
+        os: [ubuntu-20.04, windows-2019, macos-10.15]
         python-version: [3.6, 3.8]
         include:
           - os: windows-2019
@@ -93,6 +93,7 @@ jobs:
 
       - name: Install momentsLD engine.
         run: |
+          pip3 uninstall -y moments
           pip3 install Cython==0.29.18  # the last version cause erros on Windows and MacOS
           git clone --depth 1 --branch moments-1.1.11 https://bitbucket.org/simongravel/moments.git
           cd moments
@@ -114,6 +115,9 @@ jobs:
           python3 -c "import moments"
           python3 -c "import gadma"
 
+      - name: Show versions of all installed packages.
+        run: python3 -m pip freeze
+
       - name: Show available engines and optimizations in gadma.
         run: |
           python3 -c "import gadma;print(gadma.engines.engine._registered_engines.keys())"

diff --git a/tests/test_models.py b/tests/test_models.py
@@ -745,11 +745,12 @@ def test_code_generation(self):
                         else:
                             new_model.Nanc_size = Nanc
                         new_model.mutation_rate = 1.25e-8
+                        new_model.recombination_rate = 1.5e-8
                         engine.model = new_model
                         moments.LD.Inference._varcov_inv_cache = {}
 
                     cmd = engine.generate_code(input_values, None, *args, nanc=Nanc)
-                    #print(cmd)
+                    print(cmd)
                     if engine.can_evaluate:
                         # read data
                         engine.data = data
@@ -758,6 +759,7 @@ def test_code_generation(self):
                         exec(cmd, d)
 
                         msg += f": {true_ll} != {d['ll_model']}"
+                        print(true_ll, d["ll_model"])
                         if true_ll is None:  # if we have None
                             assert engine.id in ['dadi', 'moments']
                             max_ll = engine.base_module.Inference.ll(