Skip to content

Commit

Permalink
Merge pull request #79 from sebhmg/develop
Browse files Browse the repository at this point in the history
DEVOPS-515: Merge release prep branch into develop
  • Loading branch information
sebhmg authored Oct 17, 2024
2 parents 81244c0 + 488467d commit 7b9ea9f
Show file tree
Hide file tree
Showing 5 changed files with 374 additions and 228 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/python_deploy_dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Deploy python package in development

on:
push:
tags:
- 'v*' # Push events to every version tag (eg. v1.0.0)

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
with:
package-name: 'mira-omf'
python-version: '3.10'
virtual-repo-names: '["public-conda-dev"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
call-workflow-pypi-publish:
name: Publish development pypi package on JFrog Artifactory
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main
with:
package-manager: 'poetry'
package-name: 'mira-omf'
version-tag: ${{ github.ref_name }}
python-version: '3.10'
virtual-repo-names: '["public-pypi-dev"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
29 changes: 29 additions & 0 deletions .github/workflows/python_deploy_prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Deploy python package in production

on:
release:
types: [published]

jobs:
call-workflow-conda-publish:
name: Publish production conda package on JFrog Artifactory
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_conda_package.yml@main
with:
package-name: 'mira-omf'
python-version: '3.10'
virtual-repo-names: '["public-conda-prod"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
call-workflow-pypi-publish:
name: Publish production pypi package on JFrog Artifactory
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main
with:
package-manager: 'poetry'
package-name: 'mira-omf'
version-tag: ${{ github.ref_name }}
python-version: '3.10'
virtual-repo-names: '["public-pypi-prod"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ repos:
- id: pycln
args: [--config=pyproject.toml]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.9
rev: v0.7.0
hooks:
- id: ruff
args:
Expand Down Expand Up @@ -78,6 +78,7 @@ repos:
exclude_types: [jupyter]
- id: check-toml
- id: check-yaml
exclude: ^meta.yaml$
- id: check-added-large-files
- id: check-case-conflict
- id: check-merge-conflict
Expand Down
39 changes: 39 additions & 0 deletions meta.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{% 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,<3.11
- 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.9.1a0.dev0,<0.11.0a0.dev0

about:
license: MIT
license_file:
- LICENSE

extra:
recipe-maintainers:
- SophieCurinier
- sebhmg
Loading

0 comments on commit 7b9ea9f

Please sign in to comment.