diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index fa98a59..bcc992f 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: 'param-sweeps' 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 cf8a808..3ad5f8f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -78,7 +78,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 56% rename from meta.yaml rename to recipe.yaml index 2492b45..43d4301 100644 --- a/meta.yaml +++ b/recipe.yaml @@ -1,19 +1,22 @@ -{% set name = "param-sweeps" %} -{% set version = "0.3.0a1" %} +schema_version: 1 + +context: + name: param-sweeps + version: 0.3.0a1 package: - name: {{ name|lower }} - version: {{ version }} + name: ${{ name|lower }} + version: ${{ version }} source: # url: https://github.com/MiraGeoscience/{{ name }}/archive/v{{ version }}.tar.gz # sha256: 51e51c36d20fab27e3bb4a91c0a53bcbb0568f3fbf79fb9cf967db5bf665371d - 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: @@ -26,24 +29,26 @@ requirements: - numpy >=1.26.0,<1.27.0 - geoh5py >=0.10.0b1,<0.11.0a.dev -test: - imports: - - param_sweeps - commands: - - pip check - requires: - - pip +tests: + - python: + imports: + - param_sweeps + - requirements: + run: + - pip + script: + - pip check about: - home: https://www.mirageoscience.com/mining-industry-software/python-integration/ - summary: 'A Parameter sweeper for applications driven by ui.json files.' + summary: A Parameter sweeper for applications driven by ui.json files. description: | The param-sweeps library contains two main modules. One is for generating sweep files, and the other is to run a sweep over some number of parameters in a driver application. license: MIT license_file: - LICENSE - dev_url: https://github.com/MiraGeoscience/param-sweeps + homepage: https://www.mirageoscience.com/mining-industry-software/python-integration/ + repository: https://github.com/MiraGeoscience/param-sweeps extra: recipe-maintainers: diff --git a/tests/version_test.py b/tests/version_test.py index 790ed3c..313b2d6 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -31,7 +31,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() @@ -41,7 +41,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():