diff --git a/.github/workflows/python_deploy_dev.yml b/.github/workflows/python_deploy_dev.yml index 5c681284..ab4b5c87 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: 'mira-omf' 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 4dc9ef07..17980c2f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -99,7 +99,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/meta.yaml deleted file mode 100644 index 6b3363e8..00000000 --- a/meta.yaml +++ /dev/null @@ -1,39 +0,0 @@ -{% set name = "mira-omf" %} -{% set version = "3.4.0a1" %} - -package: - name: {{ name|lower }} - version: {{ version }} - -source: - path: ../omf - -build: - noarch: python - script: {{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation - number: 0 - -requirements: - host: - - python >=3.10.0,<4.0.0 - - poetry-core >=1.0.0 - - setuptools - - pip - run: - - python >=3.9.0,<3.11 - - numpy >=1.26.0,<1.27.0 - - properties >=0.6 - - pypng 0.20220715.* - - six >=1.16.0 - - vectormath >=0.2.0 - - geoh5py >=0.10.0b1,<0.11.0a.dev - -about: - license: MIT - license_file: - - LICENSE - -extra: - recipe-maintainers: - - SophieCurinier - - sebhmg diff --git a/recipe.yaml b/recipe.yaml new file mode 100644 index 00000000..8602813b --- /dev/null +++ b/recipe.yaml @@ -0,0 +1,47 @@ +schema_version: 1 + +context: + name: mira-omf + version: 3.4.0a1 + +package: + name: ${{ name|lower }} + version: ${{ version }} + +source: + path: ../omf + +build: + number: 0 + noarch: python + script: ${{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation + +requirements: + host: + - python >=3.10.0,<4.0.0 + - poetry-core >=1.0.0 + - setuptools + - pip + run: + - python >=3.9.0,<3.11 + - numpy >=1.26.0,<1.27.0 + - properties >=0.6 + - pypng 0.20220715.* + - six >=1.16.0 + - vectormath >=0.2.0 + - geoh5py >=0.10.0b1,<0.11.0a.dev + +about: + summary: API library for Open Mining Format, a new standard for mining data backed by the Global Mining Standards & Guidelines Group. + description: | + API library for Open Mining Format, a new standard for mining data backed by the Global Mining Standards & Guidelines Group. + license: MIT + license_file: + - LICENSE + homepage: https://www.mirageoscience.com/mining-industry-software/python-integration/ + repository: https://github.com/MiraGeoscience/omf + +extra: + recipe-maintainers: + - SophieCurinier + - sebhmg diff --git a/tests/version_test.py b/tests/version_test.py index 571408d8..356f2741 100644 --- a/tests/version_test.py +++ b/tests/version_test.py @@ -33,7 +33,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() @@ -43,7 +43,7 @@ def get_conda_recipe_version(): recipe = yaml.safe_load(rendered_yaml) - return recipe["package"]["version"] + return recipe["context"]["version"] def get_version_in_readme() -> str | None: