Skip to content

Commit d704670

Browse files
Swendartsebhmg
authored andcommitted
[GEOPY-2009] Merge pull request #134 from MiraGeoscience/DEVOPS-635
DEVOPS-635: build conda package faster with rattler-build # Conflicts: # recipe.yaml
1 parent 67e6b04 commit d704670

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

.github/workflows/python_deploy_dev.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ concurrency:
1212
jobs:
1313
call-workflow-conda-publish:
1414
name: Publish development conda package on JFrog Artifactory
15-
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_conda_package.yml@main
15+
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_rattler_package.yml@main
1616
with:
1717
package-name: 'simpeg-drivers'
1818
python-version: '3.10'
19-
virtual-repo-names: '["public-conda-dev"]'
19+
source-repo-names: '["public-conda-dev-local", "conda-forge-dev-remote"]'
20+
publish-repo-names: '["public-conda-dev"]'
2021
secrets:
2122
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
2223
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ repos:
7676
exclude_types: [jupyter]
7777
- id: check-toml
7878
- id: check-yaml
79-
exclude: ^meta.yaml$
79+
exclude: ^recipe.yaml$
8080
- id: check-added-large-files
8181
- id: check-case-conflict
8282
- id: check-merge-conflict

tests/version_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def get_pyproject_version():
3232

3333

3434
def get_conda_recipe_version():
35-
path = Path(__file__).resolve().parents[1] / "meta.yaml"
35+
path = Path(__file__).resolve().parents[1] / "recipe.yaml"
3636

3737
with open(str(path), encoding="utf-8") as file:
3838
content = file.read()
@@ -42,7 +42,7 @@ def get_conda_recipe_version():
4242

4343
recipe = yaml.safe_load(rendered_yaml)
4444

45-
return recipe["package"]["version"]
45+
return recipe["context"]["version"]
4646

4747

4848
def test_version_is_consistent():

0 commit comments

Comments
 (0)