Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/python_deploy_dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
39 changes: 0 additions & 39 deletions meta.yaml

This file was deleted.

47 changes: 47 additions & 0 deletions recipe.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions tests/version_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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:
Expand Down