Merge branch 'develop' into publish-gh-pages

phonopy · Dec 26, 2023 · c57227c · c57227c
2 parents 8287ddb + 5c01bcb
commit c57227c
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/.github/workflows/phono3py-pytest-conda-mkl-v2.yml b/.github/workflows/phono3py-pytest-conda-mkl-v2.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches-ignore:
     - publish-gh-pages
+    - develop
     - master
     - rc
 

diff --git a/.github/workflows/phono3py-pytest-conda-mkl.yml b/.github/workflows/phono3py-pytest-conda-mkl.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches-ignore:
     - publish-gh-pages
+    - develop
     - master
     - rc
 

diff --git a/.github/workflows/phono3py-pytest-conda.yml b/.github/workflows/phono3py-pytest-conda.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches-ignore:
     - publish-gh-pages
+    - develop
     - master
     - rc
 

diff --git a/doc/changelog.md b/doc/changelog.md
@@ -2,6 +2,10 @@
 
 # Change Log
 
+## Dec-26-2023: Version 2.9.1
+
+- Release to build conda-forge package.
+
 ## Dec-25-2023: Version 2.9.0
 
 - Pre-release of version 3.0.

diff --git a/doc/conf.py b/doc/conf.py
@@ -59,7 +59,7 @@
 # The short X.Y version.
 version = "2.9"
 # The full version, including alpha/beta/rc tags.
-release = "2.9.0"
+release = "2.9.1"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/phono3py/version.py b/phono3py/version.py
@@ -33,4 +33,4 @@
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-__version__ = "2.9.0"
+__version__ = "2.9.1"
diff --git a/test/conductivity/test_kappa_RTA.py b/test/conductivity/test_kappa_RTA.py
@@ -124,10 +124,10 @@ def test_kappa_RTA_si_nomeshsym(si_pbesol: Phono3py, si_pbesol_nomeshsym: Phono3
 def test_kappa_RTA_si_grg(si_pbesol_grg: Phono3py):
     """Test RTA by Si with GR-grid."""
     if si_pbesol_grg._make_r0_average:
-        ref_kappa_RTA_grg = [94.293, 94.293, 94.293, 0, 0, 0]
+        ref_kappa_RTA_grg = [111.204, 111.204, 111.204, 0, 0, 0]
     else:
-        ref_kappa_RTA_grg = [94.306, 94.306, 94.306, 0, 0, 0]
-    mesh = 20
+        ref_kappa_RTA_grg = [111.349, 111.349, 111.349, 0, 0, 0]
+    mesh = 30
     ph3 = si_pbesol_grg
     ph3.mesh_numbers = mesh
     ph3.init_phph_interaction()
@@ -139,11 +139,11 @@ def test_kappa_RTA_si_grg(si_pbesol_grg: Phono3py):
     kappa = ph3.thermal_conductivity.kappa.ravel()
     np.testing.assert_equal(
         ph3.thermal_conductivity.bz_grid.grid_matrix,
-        [[-4, 4, 4], [4, -4, 4], [4, 4, -4]],
+        [[-6, 6, 6], [6, -6, 6], [6, 6, -6]],
     )
     np.testing.assert_equal(
         ph3.grid.grid_matrix,
-        [[-4, 4, 4], [4, -4, 4], [4, 4, -4]],
+        [[-6, 6, 6], [6, -6, 6], [6, 6, -6]],
     )
     A = ph3.grid.grid_matrix
     D_diag = ph3.grid.D_diag
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ on: @@
       push:
         branches-ignore:
         - publish-gh-pages
+        - develop
         - master
         - rc
@@ Expand Down @@