Merge branch 'main' into eqpowspec2

metatensor · Dec 12, 2024 · 3440b66 · 3440b66
2 parents 63de9ba + cf12d41
commit 3440b66
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml
@@ -306,11 +306,11 @@ jobs:
       - name: build featomic sdist
         run: |
           pip install build
-          python -m build --sdist python/featomic
+          python -m build --sdist python/featomic --outdir ./dist/
 
       - name: build featomic-torch sdist
         run: |
-          python -m build --sdist python/featomic_torch
+          python -m build --sdist python/featomic_torch --outdir ./dist/
 
       - name: create C++ tarballs
         run: |

diff --git a/featomic-torch/VERSION b/featomic-torch/VERSION
@@ -1 +1 @@
-0.0.0
+0.6.0-rc1
diff --git a/featomic-torch/tests/cmake-project/CMakeLists.txt b/featomic-torch/tests/cmake-project/CMakeLists.txt
@@ -6,7 +6,7 @@ project(featomic-torch-test-cmake-project CXX)
 # We need to update the REQUIRED_FEATOMIC_VERSION in the same way we update the
 # featomic version for dev builds
 include(../../cmake/dev-versions.cmake)
-set(REQUIRED_FEATOMIC_TORCH_VERSION "0.0.0")
+set(REQUIRED_FEATOMIC_TORCH_VERSION "0.6.0-rc1")
 create_development_version("${REQUIRED_FEATOMIC_TORCH_VERSION}" FEATOMIC_TORCH_FULL_VERSION "featomic-torch-v")
 string(REGEX REPLACE "([0-9]*)\\.([0-9]*).*" "\\1.\\2" REQUIRED_FEATOMIC_TORCH_VERSION ${FEATOMIC_TORCH_FULL_VERSION})
 find_package(featomic_torch ${REQUIRED_FEATOMIC_TORCH_VERSION} REQUIRED)

diff --git a/python/featomic_torch/build-backend/backend.py b/python/featomic_torch/build-backend/backend.py
@@ -22,7 +22,7 @@
     FEATOMIC_DEP = f"featomic @ file://{FEATOMIC_SRC}"
 else:
     # we are building from a sdist
-    FEATOMIC_DEP = "featomic >=0.1.0.dev0,<0.2.0"
+    FEATOMIC_DEP = "featomic >=0.6.0.rc1,<0.7.0"
 
 FORCED_TORCH_VERSION = os.environ.get("FEATOMIC_TORCH_BUILD_WITH_TORCH_VERSION")
 if FORCED_TORCH_VERSION is not None:

diff --git a/python/featomic_torch/setup.py b/python/featomic_torch/setup.py
@@ -354,7 +354,7 @@ def create_version_number(version):
         install_requires.append(f"featomic @ file://{FEATOMIC_PYTHON_SRC}")
     else:
         # we are building from a sdist/installing from a wheel
-        install_requires.append("featomic >=0.1.0.dev0,<0.2.0")
+        install_requires.append("featomic >=0.6.0.rc1,<0.7.0")
 
     setup(
         version=version,