Merge branch 'moments_PR' of github.com:BoothGroup/Vayesta into momen…

…ts_PR
BoothGroup · Jul 10, 2023 · 0921324 · 0921324
2 parents aefe9f3 + f3582ce
commit 0921324
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -34,12 +34,9 @@ jobs:
         run: |
           python -m pip install wheel --user
           python -m pip install setuptools --upgrade --user
-<<<<<<< HEAD
+
           python -m pip install https://github.com/BoothGroup/dyson/archive/master.zip
-          python -m pip install .[dmet] --user
-=======
           python -m pip install .[dmet,ebcc] --user
->>>>>>> master
       - name: Run unit tests
         run: |
           python -m pip install pytest pytest-cov --user

diff --git a/vayesta/tests/ewf/test_rdm_energy.py b/vayesta/tests/ewf/test_rdm_energy.py
@@ -31,7 +31,6 @@ def test(self):
         self.assertAlmostEqual(gl, cc.e_corr)
         self.assertAlmostEqual(lg, cc.e_corr)
         self.assertAlmostEqual(gg, cc.e_corr)
-
         self.assertAlmostEqual(ewf.get_dm_energy(), cc.e_tot)
 
 class Test_UHF(TestCase):
@@ -58,8 +57,6 @@ def test(self):
         self.assertAlmostEqual(gl, cc.e_corr)
         self.assertAlmostEqual(lg, cc.e_corr)
         self.assertAlmostEqual(gg, cc.e_corr)
-
-<<<<<<< HEAD
         self.assertAlmostEqual(ewf.get_dm_energy(), cc.e_tot)
 
 #    def test_h2_solid(self):
@@ -84,8 +81,7 @@ def test(self):
 #        self.assertAlmostEqual(gl, cc.e_corr)
 #        self.assertAlmostEqual(lg, cc.e_corr)
 #        self.assertAlmostEqual(gg, cc.e_corr)
-=======
->>>>>>> master
+
 
 if __name__ == '__main__':
     print("Running %s" % __file__)