diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index e27f17e7..8c8d1a27 100644 --- a/.github/workflows/python_deploy_dev.yml +++ b/.github/workflows/python_deploy_dev.yml @@ -12,11 +12,12 @@ concurrency: jobs: call-workflow-conda-publish: name: Publish development conda package on JFrog Artifactory - uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_conda_package.yml@main + uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_rattler_package.yml@main with: package-name: 'simpeg-drivers' python-version: '3.10' - virtual-repo-names: '["public-conda-dev"]' + source-repo-names: '["public-conda-dev-local", "conda-forge-dev-remote"]' + publish-repo-names: '["public-conda-dev"]' secrets: JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }} JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 019e63c8..c2393919 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -76,7 +76,7 @@ repos: exclude_types: [jupyter] - id: check-toml - id: check-yaml - exclude: ^meta.yaml$ + exclude: ^recipe.yaml$ - id: check-added-large-files - id: check-case-conflict - id: check-merge-conflict diff --git a/meta.yaml b/recipe.yaml similarity index 82% rename from meta.yaml rename to recipe.yaml index 419d462c..561afc6d 100644 --- a/meta.yaml +++ b/recipe.yaml @@ -1,17 +1,20 @@ -{% set name = "simpeg-drivers" %} -{% set version = "0.3.0a1" %} +schema_version: 1 + +context: + name: simpeg-drivers + version: 0.3.0a1 package: - name: {{ name|lower }} - version: {{ version }} + name: ${{ name|lower }} + version: ${{ version }} source: - path: ../{{ name }} + path: ../${{ name }} build: - noarch: python - script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation number: 0 + noarch: python + script: ${{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation requirements: host: @@ -44,7 +47,7 @@ requirements: - scikit-learn >=1.4.0,<1.5.0 - tqdm >=4.66.1,<5.0.0 - zarr >=2.14.2,<2.15.0 - run_constrained: + run_constraints: - tbb 2021.12.* - python-tzdata 2023.4.* - __glibc >=2.17 diff --git a/tests/version_test.py b/tests/version_test.py index d551f3be..8e07084b 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -32,7 +32,7 @@ def get_pyproject_version(): def get_conda_recipe_version(): - path = Path(__file__).resolve().parents[1] / "meta.yaml" + path = Path(__file__).resolve().parents[1] / "recipe.yaml" with open(str(path), encoding="utf-8") as file: content = file.read() @@ -42,7 +42,7 @@ def get_conda_recipe_version(): recipe = yaml.safe_load(rendered_yaml) - return recipe["package"]["version"] + return recipe["context"]["version"] def test_version_is_consistent():