Merge branch 'main' into feat/delete_output

# Conflicts: # CONCATENATED_README.md
AntaresSimulatorTeam · Jan 8, 2025 · 0a67650 · 0a67650
2 parents 2912727 + 622c193
commit 0a67650
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 142 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -36,6 +36,3 @@ jobs:
       - name: Performs Windows tests
         if: matrix.os == 'windows-latest'
         run: tox -e 3.9-test
-
-      - name: Build README
-        run: tox -e build-readme
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -27,12 +27,19 @@ jobs:
         uses: actions/setup-python@v5
         with:
           python-version: '3.11'
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           python -m pip install build
+          python -m pip install tox
+      
+      - name: Build README
+        run: tox -e build-readme
+
       - name: Build Python 🐍 packages
         run: python -m build
+
       - name: Publish distribution 📦 to PyPI
         # Upload packages only on a tagged commit
         if: startsWith(github.ref, 'refs/tags')

diff --git a/CONCATENATED_README.md b/CONCATENATED_README.md
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,8 @@
+v0.1.7 (2025-01-08)
+-------------------
+
+- move doc generation from ci.yml to publish.yml
+
 v0.1.6 (2025-01-08)
 -------------------
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "antares_craft"
-version = "0.1.6"
+version = "0.1.7"
 description = """Antares Craft python library under construction. It will allow to create, update and read antares studies."""
 readme = "CONCATENATED_README.md"
 license = {file = "LICENSE"}