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: '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 }}
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 11 additions & 8 deletions meta.yaml → recipe.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/version_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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():
Expand Down
Loading