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: 'surface-apps'
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 @@ -75,7 +75,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
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,4 @@ def get_copyright_notice():

rst_epilog = f"""
.. |copyright_notice| replace:: {get_copyright_notice()}.
"""
"""
37 changes: 22 additions & 15 deletions meta.yaml → recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
{% set name = "surface-apps" %}
{% set version = "0.2.0a1" %}
schema_version: 1

context:
name: surface-apps
version: 0.2.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:
Expand All @@ -31,18 +34,22 @@ requirements:
- scikit-image >=0.24.0,<0.25.0
- tqdm >=4.66.1,<4.67.0


test:
imports:
- surface_apps
commands:
- pip check
requires:
- pip
tests:
- python:
imports:
- surface_apps
- requirements:
run:
- pip
script:
- pip check

about:
summary: Surface detection within geoscientific data.
license: MIT
license_file: LICENSE
homepage: https://www.mirageoscience.com/mining-industry-software/python-integration/
repository: https://github.com/MiraGeoscience/surface-apps

extra:
recipe-maintainers:
Expand Down
4 changes: 2 additions & 2 deletions tests/version_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def get_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 @@ -39,7 +39,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():
Expand Down