Merge branch 'master' into 71-joss-paper

alchemistry · Apr 6, 2024 · d040546 · d040546
2 parents 966e386 + 4e150f8
commit d040546
Show file tree

Hide file tree

Showing 14 changed files with 1,078 additions and 430 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -36,7 +36,7 @@ jobs:
         - os: macOS-latest
           python-version: 3.10
         - os: macOS-latest
-          python-version: 3.11
+          python-version: 3.11        
         - os: windows-latest
           python-version: 3.10
         - os: windows-latest
@@ -50,7 +50,7 @@ jobs:
       with:
         environment-file: devtools/conda-envs/test_env.yaml
         environment-name: test
-        extra-specs: |
+        create-args: |
             python=${{ matrix.python-version }}
 
     - name: Install package (with no dependencies)

diff --git a/CHANGES b/CHANGES
@@ -30,6 +30,10 @@ Enhancements
     (issue #337, PR #338)
   - ValueError issued when `df` and `series` for `statistical_inefficiency`
     doesn't have the same length (issue #337, PR #338)
+
+Fixes
+  - data_fraction column in workflow.convergence won't be affected by the
+    unit conversion (issue #350, PR#319).
 
 
 22/06/2023 xiki-tempula

diff --git a/docs/requirements.yaml b/docs/requirements.yaml
@@ -0,0 +1,9 @@
+name: docs
+channels:
+dependencies:
+    # Base depends
+  - python=3.10
+  - pip
+  # Doc
+  - sphinx
+  - sphinx_rtd_theme
diff --git a/readthedocs.yml b/readthedocs.yml
@@ -13,7 +13,7 @@ build:
     python: "mambaforge-4.10"
 
 conda:
-    environment: devtools/conda-envs/test_env.yaml
+    environment: docs/requirements.yaml
 
 python:
   install: