Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
184 commits
Select commit Hold shift + click to select a range
c30e3bb
Bump codecov/codecov-action from 3 to 4
dependabot[bot] Feb 1, 2024
9eefefe
Update docs
benk-mira Mar 11, 2024
8ddc70d
Merge pull request #48 from MiraGeoscience/GEOPY-1381
domfournier Mar 12, 2024
184d844
Merge branch 'release/0.3.0' into update_dev_release_0.3.0
domfournier May 17, 2024
54e4193
Cump version. Update locks
domfournier May 17, 2024
3faf416
Merge pull request #56 from MiraGeoscience/update_dev_release_0.3.0
domfournier May 17, 2024
9062049
Refactor BaseData to only take input_file on .build calls and update …
benk-mira May 21, 2024
b2e70fe
Merge pull request #38 from MiraGeoscience/dependabot/github_actions/…
domfournier May 22, 2024
89f82de
clean out trend lines utilities now implemented in curve-apps
benk-mira May 22, 2024
b3712ce
give Base data a default name and title
benk-mira May 22, 2024
2a031b1
create a string_to_lost utility for converting comma separated numeri…
benk-mira May 22, 2024
cc93e9b
Merge branch 'develop' into GEOPY-1529
benk-mira May 22, 2024
b623eab
move trend lines utils tests over as well
benk-mira May 22, 2024
27d3925
Add assets to include. Rebuild locks
domfournier May 22, 2024
39582e9
Merge branch 'GEOPY-1529' of https://github.com/MiraGeoscience/geoapp…
domfournier May 22, 2024
227912c
make geoapps-utils_assets a package
benk-mira May 22, 2024
5547699
Merge branch 'GEOPY-1529' of github.com:MiraGeoscience/geoapps-utils …
benk-mira May 22, 2024
a6e39b4
remove pylint disable (didn't work)
benk-mira May 22, 2024
957abaa
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 22, 2024
9455463
Pull out ifile from params mechanics of write_ui_json to public input…
benk-mira May 23, 2024
dde144b
Merge branch 'GEOPY-1529' into GEOPY-761
benk-mira May 23, 2024
44c1c49
Merge pull request #57 from MiraGeoscience/GEOPY-1529
domfournier May 23, 2024
ef2aed1
Merge branch 'release/0.3.0' into update_release
domfournier May 27, 2024
3d76c11
Merge pull request #59 from MiraGeoscience/update_release
andrewg-mira May 28, 2024
3e82822
turn off validation in input_file data update
benk-mira May 29, 2024
3c0a292
Merge branch 'develop' into GEOPY-761
benk-mira May 29, 2024
d23bb7b
remove string_to_list
benk-mira May 30, 2024
f303a23
fix test
benk-mira May 30, 2024
65dc707
Merge pull request #60 from MiraGeoscience/GEOPY-761
domfournier May 30, 2024
fd72f37
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Jun 3, 2024
79da17e
update PIllow to match geoh5py (10.3)
benk-mira Jun 7, 2024
5902c85
Merge pull request #62 from MiraGeoscience/GEOPY-523
domfournier Jun 7, 2024
778cec9
Merge pull request #39 from MiraGeoscience/pre-commit-ci-update-config
domfournier Jun 17, 2024
8d7ceed
upgrade scipy
benk-mira Jun 19, 2024
dfbd14d
Merge pull request #65 from MiraGeoscience/upgrade-scipy
domfournier Jun 19, 2024
106943e
add mask_under_horizon function (adapted from active_from_xyz of simp…
benk-mira Jun 28, 2024
9e49664
Merge pull request #66 from MiraGeoscience/GEOPY-1567
domfournier Jun 28, 2024
0e13449
Merge branch 'main' into main_to_develop
sebhmg Jun 29, 2024
ed74e86
newer geoh5py and numpy
sebhmg Jun 29, 2024
f68cd5f
expose assets_path from top level
sebhmg Jun 29, 2024
46148d9
remove irrelevant conda_environment_boolean from ui.son
sebhmg Jun 29, 2024
8fd2c7d
pre-commit autoupdate
sebhmg Jun 29, 2024
5422b9a
allow python 3.11 and 3.12
sebhmg Jun 29, 2024
eaeb0eb
fix assets_path
sebhmg Jun 29, 2024
4e5cf1a
coverage down to 75
sebhmg Jun 29, 2024
d37c8e5
Merge pull request #67 from MiraGeoscience/main_to_develop
sebhmg Jun 29, 2024
8a5bac6
update lock file as geoh5py moved on develop branch
sebhmg Jun 29, 2024
5d8a3c2
update comment about declaring git dependencies
sebhmg Jun 29, 2024
a7ec429
Fix sha on geoh5py develop
domfournier Jul 3, 2024
acf608e
Bump scipy
domfournier Jul 4, 2024
385d9fd
Fix pathing to assets
domfournier Jul 4, 2024
2190ecb
Test moving asset_path back to init
domfournier Jul 4, 2024
f478d7d
Bring back assets
domfournier Jul 4, 2024
0124481
Merge pull request #68 from MiraGeoscience/GEOPY-1569
domfournier Jul 4, 2024
ff4ed17
GEOPY-1616: relock on newer geoh5py develop branch
sebhmg Jul 4, 2024
4fc5c13
Merge pull request #69 from MiraGeoscience/GEOPY-1616
sebhmg Jul 4, 2024
18b1565
fix tiny typo in comment
sebhmg Jul 5, 2024
03aa505
minor comment: pydantic also in geoh5py
sebhmg Jul 5, 2024
7ca41cb
GEOPY-1616: restrict to Python 3.10 due to PySide2
sebhmg Jul 10, 2024
6dd821c
move indirect dependencies under conda-lock section
sebhmg Jul 10, 2024
6b27f30
First pass to remove dash from geoapps-utils.
MatthieuCMira Jul 23, 2024
0984126
Re-build env
domfournier Jul 23, 2024
638d42c
Point to develop
domfournier Jul 23, 2024
ce95f1c
Lower threshold
domfournier Jul 23, 2024
e0cc6f5
Merge pull request #70 from MiraGeoscience/GEOPY-1681
domfournier Jul 23, 2024
96bde77
update geoapps-utils to accept BaseData as a parameter
MatthieuCMira Jul 25, 2024
804211e
Update geoapps_utils/driver/driver.py
MatthieuCMira Jul 25, 2024
cac4489
simpeg drivers seems quite hacky.
MatthieuCMira Jul 25, 2024
07d8a5c
function to create a BaseData directly if a path or an InputFile is p…
MatthieuCMira Jul 26, 2024
8d0b969
modify "createa_from_input_file
MatthieuCMira Jul 26, 2024
d54b9ef
"start" was already doing what I intented to do.
MatthieuCMira Jul 26, 2024
06f7896
change the "build" of paseparams to be more like the one of data.
MatthieuCMira Jul 29, 2024
798d60e
[DEVOPS-452] Use new github workflows + Update .,pre-commit-config
Jul 30, 2024
0ec8b78
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 30, 2024
b0e4803
[DEVOPS-452] Delete useless scripts
Jul 30, 2024
2d70a41
Merge branch 'DEVOPS-452_Apply_modification' of https://github.com/Mi…
Jul 30, 2024
17ee831
small change based o Ben's comments
MatthieuCMira Jul 30, 2024
863846b
removing the conflicting line.
MatthieuCMira Jul 30, 2024
f545f6d
changing the BaseData default ui_json to None.
MatthieuCMira Jul 30, 2024
6f57a50
removing commented test
MatthieuCMira Jul 30, 2024
2f45b16
[DEVOPS-452] Apply new CI-tools modification
Jul 31, 2024
198eb34
[DEVOPS-452] Ruff fixes
Jul 31, 2024
a01dabe
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 31, 2024
86afc29
[DEVOPS-452] Mypy fixes
Jul 31, 2024
bda59ea
Merge branch 'DEVOPS-452_Apply_modification' of https://github.com/Mi…
Jul 31, 2024
9461754
[DEVOPS-452] Undo modification on driver_test
Jul 31, 2024
d71eb96
changing "create_input_file_from_attributes" private
MatthieuCMira Jul 31, 2024
b0e2073
Merge pull request #72 from MiraGeoscience/GEOPY-1688
MatthieuCMira Jul 31, 2024
f3aedca
correct dependencies for conda
sebhmg Aug 1, 2024
b484db0
restore classifiers (got removed by mistake?)
sebhmg Aug 1, 2024
9746ae8
relock conda envs
sebhmg Aug 1, 2024
517e244
Merge pull request #75 from sebhmg/develop
sebhmg Aug 1, 2024
a2683a8
need init to make assets a package
sebhmg Aug 1, 2024
7c651c7
Merge branch 'develop' into DEVOPS-452_Apply_modification
sebhmg Aug 1, 2024
2736adf
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 1, 2024
d154259
use strict zip in test
sebhmg Aug 1, 2024
5cd4511
[DEVOPS-452] Disable RUF012 and UP038
Aug 2, 2024
fb57c84
Merge branch 'DEVOPS-452_Apply_modification' of https://github.com/Mi…
Aug 2, 2024
4fbb050
Merge pull request #74 from MiraGeoscience/DEVOPS-452_Apply_modification
Swendart Aug 2, 2024
2bc1ea4
pyproject: remove commented out git URL
sebhmg Aug 2, 2024
90a1c99
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Aug 5, 2024
572b6f5
Fix type
domfournier Aug 6, 2024
32e22d7
Merge pull request #76 from MiraGeoscience/pre-commit-ci-update-config
domfournier Aug 7, 2024
76e6caf
Move to geoh5py@feature/0.10.0
domfournier Aug 19, 2024
182c7ac
Merge pull request #77 from MiraGeoscience/GEOPY-1645
domfournier Aug 19, 2024
b9ced93
[DEVOPS-440] Use regular double quote in README.rst
Aug 29, 2024
921261e
Merge pull request #78 from MiraGeoscience/DEVOPS-440
sebhmg Aug 29, 2024
bd565aa
Point to release/0.10.0
domfournier Sep 10, 2024
2af23cb
Merge branch 'develop' into GEOPY-1749
domfournier Sep 10, 2024
4bc408a
Merge pull request #80 from MiraGeoscience/GEOPY-1749
domfournier Sep 10, 2024
4cb42e7
[DEVOPS-466] Update input variable in shared workflows
Sep 16, 2024
0fe09a1
[DEVOPS-466] Update app-name
Sep 17, 2024
60c39f4
[GEOPY-1712] Exclude RUFF005
Sep 18, 2024
8726c9a
Merge pull request #82 from MiraGeoscience/GEOPY-1712
Swendart Sep 19, 2024
e746513
[DEVOPS-466] Update python_analysis
Sep 25, 2024
5182e2e
[DEVOPS-466] Update before merging
Sep 27, 2024
693a3f3
Merge pull request #81 from MiraGeoscience/DEVOPS-466
Swendart Sep 30, 2024
6fc80e3
Fix handling of parameters not in default json
domfournier Oct 4, 2024
bf587ed
[DEVOPS-504] Add deploy workflows
Oct 4, 2024
2c214b7
[DEVOPS-504] Only create conda package
Oct 4, 2024
6aafff2
Open the workspace on start
domfournier Oct 4, 2024
9740b10
Add version to base params
domfournier Oct 4, 2024
8c56e40
[DEVOPS-504] Meta.yaml
Oct 4, 2024
5e7e894
[DEVOPS-504] Test in conda build
Oct 4, 2024
757648b
REfresh locks
domfournier Oct 4, 2024
7a34844
[DEVOPS-504] Disable testing in conda build
Oct 4, 2024
11711b9
Bump version for develop
domfournier Oct 4, 2024
cd60b11
Merge branch 'release/0.4.0' into GEOPY-1774
domfournier Oct 4, 2024
e2bb0f0
Update version
domfournier Oct 4, 2024
9542e37
Merge pull request #84 from MiraGeoscience/GEOPY-1774
domfournier Oct 4, 2024
51ad1c3
[DEVOPS-504] Update deploy workflows
Oct 7, 2024
0b8925c
[DEVOPS-504] Update package deployment
Oct 7, 2024
dd29c52
[DEVOPS-504] Cleaning for PR
Oct 9, 2024
47df776
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 9, 2024
1b1d92b
[DEVOPS-504] Add jinja2 and packaging to pyproject
Oct 9, 2024
faad5cb
Merge branch 'DEVOPS-504' of https://github.com/MiraGeoscience/geoapp…
Oct 9, 2024
d330b98
[DEVOPS-504] Ready to merge
Oct 10, 2024
54592d1
[DEVOPS-504] Generate conda lock files
Oct 15, 2024
b6fc700
[DEVOPS-504] Update comment in python_deploy_dev
Oct 16, 2024
d38cca9
Delete .jfrog/projects/poetry.yaml
Swendart Oct 16, 2024
f667db7
Merge branch 'release/0.4.0' of https://github.com/MiraGeoscience/geo…
Oct 17, 2024
27d7799
Merge branch 'DEVOPS-504' of https://github.com/MiraGeoscience/geoapp…
Oct 17, 2024
ea741c9
Merge pull request #85 from MiraGeoscience/DEVOPS-504
Swendart Oct 17, 2024
524223f
[DEVOPS-511] Update deploy workflows to release pip package on pypi
Oct 20, 2024
ec316c5
Merge pull request #86 from MiraGeoscience/DEVOPS-511
sebhmg Oct 24, 2024
8a0f260
no poetry.lock here, using conda-lock
sebhmg Oct 24, 2024
3f4d139
enable pre-commit check-added-large-files
sebhmg Oct 24, 2024
cae3230
publish to codecov one platform only
sebhmg Oct 24, 2024
ad15954
DEVOPS-515: fix linter errors
sebhmg Oct 24, 2024
ce686bc
Merge pull request #87 from MiraGeoscience/DEVOPS-515-linter-errors
sebhmg Oct 24, 2024
eb07912
change labels for publish tasks
sebhmg Oct 31, 2024
0b4f239
relocked on published geoh5py > 0.10.0a1
sebhmg Oct 31, 2024
fbe33e8
bump version to alpha.2
sebhmg Oct 31, 2024
4ba5225
add concurrency conditions to github publish workflows
sebhmg Nov 1, 2024
a329d56
use new publish workflows
sebhmg Nov 16, 2024
9bcb0e7
bump version to beta.1
sebhmg Nov 16, 2024
32b95e6
align version spec in conda meta and pyproject.toml
sebhmg Nov 16, 2024
fd95852
relock on newer published dependencies
sebhmg Nov 16, 2024
b137e94
minor github workflow job renaming
sebhmg Nov 18, 2024
7dd37a4
bump version to beta.2
sebhmg Nov 18, 2024
241af74
do not include top level files in wheels
sebhmg Nov 20, 2024
ad25f1f
conda recipe: allow python 3.*
sebhmg Nov 22, 2024
758b837
fix URLs to readthedocs
sebhmg Nov 22, 2024
605ae47
allow to republish to the dev environment
sebhmg Nov 22, 2024
e1ab652
Merge pull request #92 from sebhmg/GEOPY-1860
sebhmg Nov 29, 2024
538b69d
[DEVOPS-540] Test version consistency
Dec 17, 2024
f6ad5ad
Merge pull request #97 from MiraGeoscience/DEVOPS-540
domfournier Dec 17, 2024
930c4cc
Update copyright block
domfournier Jan 7, 2025
c8ee332
Pre-commit update
domfournier Jan 7, 2025
ea0c536
Change type of workspace_geoh5
domfournier Jan 7, 2025
e978898
Update years in license and readmes
domfournier Jan 8, 2025
e39b84d
Merge pull request #99 from MiraGeoscience/GEOPY-1933
domfournier Jan 8, 2025
32c5b2f
Merge branch 'release/0.4.0' into GEOPY-1918
domfournier Jan 8, 2025
63fd2eb
Fix tests. re-lock
domfournier Jan 8, 2025
250fd92
Update lock files
domfournier Jan 8, 2025
9104f37
Merge pull request #100 from MiraGeoscience/GEOPY-1918
domfournier Jan 8, 2025
15bb08d
Update lock files
domfournier Jan 9, 2025
d9d940c
Merge pull request #101 from MiraGeoscience/GEOPY-1918b
domfournier Jan 9, 2025
fa9bba5
fixup copyrights
sebhmg Jan 10, 2025
b09d860
Merge pull request #102 from sebhmg/GEOPY-1933
sebhmg Jan 10, 2025
4e8f20c
lock on newer geoh5py
sebhmg Jan 10, 2025
e11c3d5
bump version to rc.1
sebhmg Jan 10, 2025
4d74219
Merge pull request #103 from sebhmg/GEOPY-1935
sebhmg Jan 10, 2025
c5b4bbc
Remove RC
domfournier Jan 30, 2025
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
2 changes: 1 addition & 1 deletion .codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ checks:
argument-count:
enabled: true
config:
threshold: 6
threshold: 10 # as long as not hitting too-many-positional-arguments
complex-logic:
enabled: true
config:
Expand Down
34 changes: 5 additions & 29 deletions .github/workflows/issue_to_jira.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,12 @@
# This workflow will create a JIRA issue upon creation of a GitHub issue

name: Create JIRA issue

on:
issues:
types: [opened]

jobs:
new_jira_issue:
runs-on: ubuntu-latest

steps:
- name: JIRA Login
uses: atlassian/gajira-login@v3.0.1
env:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_USER_EMAIL: ${{ secrets.JIRA_USER_EMAIL }}
JIRA_API_TOKEN: ${{ secrets.JIRA_API_TOKEN }}
- name: Jira Create issue
id: create_jira_issue
uses: atlassian/gajira-create@v3.0.1
with:
project: GEOPY
issuetype: Story
summary: ${{ github.event.issue.title }}
description: "_from [GitHub issue #${{ github.event.issue.number }}|${{ github.event.issue.html_url }}]_"
# Additional fields in JSON format
fields: '{"components": [{"name": "geoapps"}]}'
- name: Post JIRA link
uses: peter-evans/create-or-update-comment@v3
with:
# The number of the issue or pull request in which to create a comment.
issue-number: ${{ github.event.issue.number }}
# The comment body.
body: "JIRA issue [${{ steps.create_jira_issue.outputs.issue }}] was created."
call-workflow-create-jira-issue:
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-issue_to_jira.yml@main
secrets: inherit
with:
project-key: 'GEOPY'
60 changes: 3 additions & 57 deletions .github/workflows/pr_add_jira_summary.yml
Original file line number Diff line number Diff line change
@@ -1,64 +1,10 @@
# This workflow will comment the PR with the JIRA issue summary
# if a JIRA issue number is detected in the branch name or title

name: Add JIRA issue summary

on:
pull_request_target:
types: [opened]

jobs:
add_jira_summary:
runs-on: ubuntu-latest

steps:
- name: Find JIRA issue key
id: find_jira_key
env:
HEAD_REF: ${{ github.head_ref}}
PR_TITLE: ${{ github.event.pull_request.title }}
run: >
echo $HEAD_REF $PR_TITLE
| echo "issue_key=$(
grep -osi "\b\(GA\|GEOPY\|DEVOPS\)[ #-]*[0-9]\+"
| head -n1
| sed -E "s/([A-Z]+)[-# ]*([0-9]+)/\1-\2/i"
| tr [:lower:] [:upper:]
)"
>> $GITHUB_OUTPUT
- name: Get JIRA summary
id: get_jira_summary
if: ${{ steps.find_jira_key.outputs.issue_key }}
env:
JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
JIRA_BASIC_AUTH: ${{ secrets.JIRA_BASIC_AUTH }}
run: >
curl -sS -X GET
-H "Authorization: Basic $JIRA_BASIC_AUTH"
-H "Content-Type: application/json"
"$JIRA_BASE_URL/rest/api/2/issue/${{ steps.find_jira_key.outputs.issue_key }}"
| echo "summary=$(jq -r '.fields.summary // empty')" >> $GITHUB_OUTPUT
- name: Extract PR title
id: get_pr_title
env:
PR_TITLE: ${{ github.event.pull_request.title }}
run: |
echo "text=$(echo $PR_TITLE | sed -E "s/^\s*[?[A-Z]+[-# ]*[0-9]+]?[-: ]*(.*)/\1/i")" >> $GITHUB_OUTPUT
- name: Add comment
if: ${{ steps.find_jira_key.outputs.issue_key }}
env:
ISSUE_SUMMARY: ${{ steps.get_jira_summary.outputs.summary }}
TITLE_TEXT: ${{ steps.get_pr_title.outputs.text }}
PR_BODY: ${{ github.event.pull_request.body }}
run: >
jq
--arg ISSUE_ID "${{ steps.find_jira_key.outputs.issue_key }}"
--arg ISSUE_SUMMARY "$(cat <<< $ISSUE_SUMMARY)"
--arg TITLE_TEXT "$(cat <<< ${TITLE_TEXT:-$ISSUE_SUMMARY})"
--arg PR_BODY "$(cat <<< $PR_BODY)"
-c '{"title": ($ISSUE_ID + ": " + $TITLE_TEXT), "body": ("**" + $ISSUE_ID + " - " + $ISSUE_SUMMARY + "**\n" + $PR_BODY)}' <<< {}
| curl -sS -X POST -d @-
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}"
-H "Content-Type: application/json"
"$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/pulls/${{ github.event.pull_request.number }}"
> /dev/null
call-workflow-add-jira-issue-summary:
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-jira-pr_add_jira_summary.yml@main
secrets: inherit
53 changes: 0 additions & 53 deletions .github/workflows/pytest-unix-os.yaml

This file was deleted.

61 changes: 0 additions & 61 deletions .github/workflows/pytest-windows.yaml

This file was deleted.

43 changes: 43 additions & 0 deletions .github/workflows/python_analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Python analysis

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
branches:
- develop
- main
- release/**
- feature/**
- hotfix/**
push:
branches:
- develop
- main
- release/**
- feature/**
- hotfix/**

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
call-workflow-static-analysis:
name: Static analysis
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-static_analysis.yml@main
with:
package-manager: 'conda'
app-name: 'geoapps_utils'
python-version: '3.10'
call-workflow-pytest:
name: Pytest
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
with:
package-manager: 'conda'
python-versions: '["3.10", "3.11", "3.12"]'
os: '["windows-latest", "ubuntu-latest"]'
cache-number: 1
codecov-reference-python-version: '3.10'
codecov-reference-os: '["windows-latest"]'
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
35 changes: 35 additions & 0 deletions .github/workflows/python_deploy_dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Deploy python package in development

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

concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
cancel-in-progress: true

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: 'geoapps-utils'
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 (JFrog Artifactory, TestPyPI)
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-publish_pypi_package.yml@main
with:
package-manager: 'poetry'
package-name: 'geoapps-utils'
version-tag: ${{ github.ref_name }}
python-version: '3.10'
virtual-repo-names: '["public-pypi-dev", "test-pypi"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
PYPI_TOKEN: ${{ secrets.TEST_PYPI_TOKEN }}
56 changes: 56 additions & 0 deletions .github/workflows/python_deploy_prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Deploy python package in production

on:
release:
types: [published]
workflow_dispatch:
inputs:
release-tag:
description: 'Tag for the existing (draft) release to publish assets from'
required: true
publish-conda:
description: 'Publish Conda package'
required: false
type: boolean
default: true
publish-pypi:
description: 'Publish PyPI package'
required: false
type: boolean
default: true
environment:
description: 'The environment to publish to'
required: true
type: choice
default: prod
options:
- prod
- dev

concurrency:
group: ${{ github.workflow }}-${{ github.event.release.tag_name || github.event.inputs.release-tag || github.run_id }}
cancel-in-progress: true

jobs:
call-workflow-conda-release:
name: Publish production Conda package on JFrog Artifactory
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_conda_assets.yml@main
if: ${{ github.event_name == 'release' || github.event.inputs.publish-conda == 'true' }}
with:
virtual-repo-names: '["public-conda-${{ inputs.environment }}"]'
release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
call-workflow-pypi-release:
name: Publish production PyPI package (JFrog Artifactory, PyPI)
if: ${{ github.event_name == 'release' || github.event.inputs.publish-pypi == 'true' }}
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-release_pypi_assets.yml@main
with:
package-name: 'geoapps-utils'
virtual-repo-names: ${{ inputs.environment == 'prod' && '["public-pypi-prod", "pypi"]' || '["public-pypi-dev", "test-pypi"]' }}
release-tag: ${{ github.event.release.tag_name || github.event.inputs.release-tag }}
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }}
Loading