Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
e9aa063
Merge remote-tracking branch 'origin/main' into GEOPY-1630
sebhmg Jul 5, 2024
99a692c
user newer version of geoh5py
sebhmg Jul 5, 2024
5b69d67
GEOPY-1630: static analysis on Python 3.9
sebhmg Jul 5, 2024
5634e6c
Merge pull request #65 from MiraGeoscience/GEOPY-1630
sebhmg Jul 5, 2024
4e1defc
[GEOPY-1233] Use reusable github workflows
Jul 18, 2024
85a94d8
[GEOPY-1233] Use mirageoscience.pre-commit-hooks package + Update mir…
Jul 18, 2024
5ced5d6
[DEVOPS-452] Add ruff hooks and update .pre-commit-config.yaml
Jul 24, 2024
7509761
[DEVOPS-452] Ruff fixes
Jul 24, 2024
995fb46
[DEVOPS-452] Update with new github workflows + pre-commit-hooks
Jul 30, 2024
a36d865
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 30, 2024
ffeefed
[DEVOPS-452] Delete useless scripts
Jul 30, 2024
b0a96d6
Merge branch 'DEVOPS-452' of https://github.com/MiraGeoscience/omf in…
Jul 30, 2024
846510e
[DEVOPS-452] Update python_analysis with the new CI-tool relase + Dis…
Jul 31, 2024
788fbfd
TODO to add check-copyright
sebhmg Jul 31, 2024
564b60e
[DEVOPS-452] Restrict ruff check to devtools|omf/fileio/geoh5|tests
Aug 1, 2024
44978e2
Merge branch 'DEVOPS-452' of https://github.com/MiraGeoscience/omf in…
Aug 1, 2024
faac269
[DEVOPS-452] Fix .pre-commit-config syntax
Aug 1, 2024
25baea9
[DEVOPS-452] Restrict which files are gonna be check by MiraGeoscienc…
Aug 1, 2024
75c6bc1
[DEVOPS-452] Enable some ruff rules
Aug 1, 2024
d71f15c
[DEVOPS-452] Disable RUF012 and UP038 rules
Aug 1, 2024
59e79a7
[DEVOPS-452] Disable RUF012 and UP038
Aug 1, 2024
edfee23
pyproject: remove commented out git URL
sebhmg Aug 2, 2024
e970864
[DEVOPS-452] Change python target version used by ruff
Swendart Aug 5, 2024
aeebf85
[DEVOPS-452] Update mypy ignore path
Aug 5, 2024
dd23011
Merge branch 'DEVOPS-452' of https://github.com/MiraGeoscience/omf in…
Aug 5, 2024
0921080
[DEVOPS-452] also run pre-commit on omf/scripts
sebhmg Aug 5, 2024
3dfe15c
[DEVOPS-452] do not check for copyrights
sebhmg Aug 5, 2024
85a3df2
[DEVOPS-452] re-enable check-added-large-files
sebhmg Aug 5, 2024
811f050
Merge branch 'develop' into DEVOPS-452
sebhmg Aug 5, 2024
467cf8a
[DEVOPS-452] Update ignore-paths in pylintrc
Aug 5, 2024
acdd938
Merge branch 'DEVOPS-452' of https://github.com/MiraGeoscience/omf in…
Aug 5, 2024
da56235
pylint ignore: skip source files from upstream repo
sebhmg Aug 5, 2024
7a21edf
[DEVOPS-452] Correct pylint ignore-paths
Aug 5, 2024
60cdb4e
explicit list of files exclusion for pylint
sebhmg Aug 5, 2024
5e3ea7b
Merge branch 'DEVOPS-452-pylint-ignore' into DEVOPS-452
sebhmg Aug 5, 2024
4e80149
move ruff exclusion from pre-commit to config
sebhmg Aug 5, 2024
f370027
fix precommit file inclusions
sebhmg Aug 5, 2024
cec2114
use libpath instead of os.path
sebhmg Aug 5, 2024
bf3a5c2
use shared test fixture for random project
sebhmg Aug 5, 2024
cf8a1d0
exclude ^docs through pre-commit config for ruff
sebhmg Aug 5, 2024
5becb3b
ruff uses glob for exclude patterns
sebhmg Aug 5, 2024
731c650
Merge pull request #66 from MiraGeoscience/DEVOPS-452
sebhmg Aug 5, 2024
802b27b
remove unused class member
sebhmg Aug 5, 2024
4775332
remove wrong class members
sebhmg Aug 5, 2024
2dbcc02
disable RUF012 where appropriate
sebhmg Aug 5, 2024
90617ec
Ruff report addressed
sebhmg Aug 5, 2024
a46430c
do not disable RUF012
sebhmg Aug 6, 2024
b65b073
Bump version
domfournier Jun 17, 2024
0abbfbb
Bump version in toml
domfournier Jun 17, 2024
3d5fc79
more versions
domfournier Jun 17, 2024
f7a081a
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 6, 2024
e1976de
Merge pull request #69 from MiraGeoscience/bump_version
sebhmg Aug 6, 2024
fbbf0b7
Merge pull request #68 from sebhmg/DEVOPS-452-address-Ruff
sebhmg Aug 7, 2024
e6f1be1
[DEVOPS-440] Use regular double quote in README.rst
Aug 29, 2024
b2f986b
Merge pull request #70 from MiraGeoscience/DEVOPS-440
sebhmg Aug 29, 2024
0106345
[DEVOPS-466] Update input variable in shared workflows
Sep 16, 2024
f60b42a
[DEVOPS-466] Relaunch worklfows
Sep 17, 2024
df0be6e
[DEVOPS-466] Relaunch worklfows
Sep 17, 2024
c45a8db
[GEOPY-1712] Exclude RUFF005
Sep 18, 2024
84bde1f
Merge pull request #72 from MiraGeoscience/GEOPY-1712
Swendart Sep 19, 2024
a01c649
[DEVOPS-466] Update python_analysis
Sep 25, 2024
78f99ed
[DEVOPS-466] Update before merging
Sep 27, 2024
3aa71f4
Merge pull request #71 from MiraGeoscience/DEVOPS-466
Swendart Sep 27, 2024
171af42
[DEVOPS-504] Add conda's recipe and deploy workflows
Oct 7, 2024
e859b8c
[DEVOPS-504] Modify pypng version in conda's recipe
Oct 7, 2024
bfb1a78
[DEVOPS-504] Update conda's recipe
Oct 7, 2024
785bdbc
DEVOPS-515: prepare release v3.2.2
sebhmg Oct 8, 2024
695dfa6
[DEVOPS-515] set version in code: 3.2.2-beta.1
sebhmg Oct 8, 2024
206c879
[DEVOPS-515] change dependency to geoh5py@release/0.1.0
sebhmg Oct 8, 2024
b571fb7
[DEVOPS-515] stop testing py39, pyupgrade to py310
sebhmg Oct 8, 2024
3830466
bump minor version and set to alpha status
sebhmg Oct 8, 2024
8a33ec3
[DEVOPS-504] Update deployment workflows
Oct 8, 2024
64e5e00
[DEVOPS-504] Cleaning for PR
Oct 9, 2024
5de8667
[DEVOPS-504] Delete useless line in .gitignore
Oct 9, 2024
565b9e2
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 9, 2024
373a65e
[DEVOPS-504] Add source to pyproject
Oct 10, 2024
f6dc1c7
Merge branch 'DEVOPS-504' of https://github.com/MiraGeoscience/omf in…
Oct 10, 2024
b4e620b
[DEVOPS-504] Update conda's recipe dependencies
Oct 10, 2024
2e1ac27
[DEVOPS-504] Update github refs
Oct 10, 2024
2bba99d
[DEVOPS-504] Disable test part in conda's recipe
Oct 10, 2024
618dcbb
[DEVOPS-504] Generate poetry.lock
Oct 15, 2024
798012c
Fix reference to value_map.map
domfournier Oct 15, 2024
fdd3640
[DEVOPS-504] Update comment in python_deploy_dev
Oct 16, 2024
5c2443a
Merge branch 'release/3.3.0' into GEOPY-1780
domfournier Oct 16, 2024
84cfe2c
Merge pull request #2 from MiraGeoscience/GEOPY-1780
sebhmg Oct 16, 2024
5807b7c
[DEVOPS-515] enough to publish to codecov from one OS
sebhmg Oct 16, 2024
93c83aa
[DEVOPS-515] apply pre-commit autoupdate
sebhmg Oct 16, 2024
c7a8c8f
Merge pull request #73 from sebhmg/DEVOPS-515
sebhmg Oct 16, 2024
00b0a92
Merge branch 'release/3.3.0' into DEVOPS-504
Swendart Oct 17, 2024
1c7881d
[DEVOPS-504] Update omf version
Oct 17, 2024
cb59625
Merge branch 'DEVOPS-504' of https://github.com/MiraGeoscience/omf in…
Oct 17, 2024
da1632e
[DEVOPS-504] Update version in README.rst
Oct 17, 2024
94db5de
Merge pull request #74 from MiraGeoscience/DEVOPS-504
Swendart Oct 17, 2024
8221ad0
[DEVOPS-515] restore 3.3.0 alpha version
sebhmg Oct 17, 2024
b14395e
[DEVOPS-515] apply pre-commit autoupdate
sebhmg Oct 17, 2024
a03b81f
Merge pull request #78 from sebhmg/DEVOPS-515_fixup_version
sebhmg Oct 17, 2024
773b1cb
[DEVOPS-511] Update deploy workflows to release pip package on pypi
Oct 20, 2024
ae362f0
lock on published geoh5py 0.10.0b1
sebhmg Oct 30, 2024
273baf9
bump version to 3.3.0 alpha.2
sebhmg Oct 30, 2024
201f8c1
change labels of publish tasks
sebhmg Oct 31, 2024
eec7edb
Merge tag 'v3.3.0-alpha.1.post.1' into release/3.3.0
sebhmg Oct 31, 2024
59be20a
add concurrency conditions to github publish workflows
sebhmg Nov 1, 2024
a63e3a9
use new publish workflows
sebhmg Nov 16, 2024
50935df
relocked on newer published geoh5py
sebhmg Nov 16, 2024
a8d0ff0
bump version to beta.1
sebhmg Nov 16, 2024
950af16
change version specs to >=0.x instead of ~0.x
sebhmg Nov 16, 2024
5144baf
align version spec in conda meta and pyproject.toml
sebhmg Nov 16, 2024
6fba672
minor github workflow job renaming
sebhmg Nov 18, 2024
32c9a87
bump version to beta.2
sebhmg Nov 18, 2024
5c4198a
do not use ~0.x in version constraints
sebhmg Nov 19, 2024
398a7d5
[GEOPY-1860] do not include top level files in wheels
sebhmg Nov 20, 2024
023ccfb
fix URL to readthedocs
sebhmg Nov 29, 2024
7a628b5
in conda recipe, allow for Python 3.*
sebhmg Nov 29, 2024
5268aa0
Merge pull request #81 from sebhmg/GEOPY-1860
sebhmg Nov 29, 2024
d9d111b
[DEVOPS-540] Add a version consistency test
Dec 17, 2024
57c7856
[DEVOPS-540] Add test dependencies
Dec 17, 2024
789c3f2
[DEVOPS-540] Lock poetry
Dec 17, 2024
e01eefa
[DEVOPS-540] Correct mypy config
Dec 17, 2024
9d33a8c
Merge pull request #82 from MiraGeoscience/DEVOPS-540
domfournier Dec 17, 2024
8dc0108
[GEOPY-1933] update copyright year
sebhmg Jan 10, 2025
5bd2be7
[GEOPY-1935] bump version to rc.1
sebhmg Jan 10, 2025
81ae0d9
[GEOPY-1935] relock on newer geoh5py
sebhmg Jan 10, 2025
71d9d4c
[GEOPY-1935] pecommit autoupdate
sebhmg Jan 10, 2025
6eac7b4
[GEOPY-1935] fix expected error text in test for Python 3.12
sebhmg Jan 10, 2025
437a0e5
Merge pull request #83 from sebhmg/GEOPY-1935
sebhmg Jan 10, 2025
9e7c58e
[GEOPY-1933] configure and add copyrights statements
sebhmg Jan 10, 2025
2e5a1b8
[GEOPY-1933] dual copyright in __init__.py
sebhmg Jan 10, 2025
ddb77e4
[GEOPY-1933] dual copyright in __init__.py
sebhmg Jan 10, 2025
1c8e039
[GEOPY-1933] copyright date range: since 2022
sebhmg Jan 10, 2025
8c2dd42
[GEOPY-1933] fix file exclusion for copyright check
sebhmg Jan 10, 2025
6174e84
Merge pull request #84 from sebhmg/GEOPY-1933
sebhmg Jan 10, 2025
9f050f0
official 3.3.0 version
sebhmg Feb 8, 2025
6cb3a4e
relock on newer geoh5py
sebhmg Feb 8, 2025
8215583
remove version from README
sebhmg Feb 8, 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
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": "OMF"}]}'
- 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
64 changes: 0 additions & 64 deletions .github/workflows/pytest-unix-os.yml

This file was deleted.

70 changes: 0 additions & 70 deletions .github/workflows/pytest-windows.yml

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: 'poetry'
app-name: 'omf'
python-version: '3.10'
call-workflow-pytest:
name: Pytest
uses: MiraGeoscience/CI-tools/.github/workflows/reusable-python-pytest.yml@main
with:
package-manager: 'poetry'
python-versions: '["3.10", "3.11", "3.12"]'
os: '["ubuntu-latest", "windows-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: '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 (JFrog Artifactory, TestPyPI)
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", "test-pypi"]'
secrets:
JFROG_ARTIFACTORY_URL: ${{ secrets.JFROG_ARTIFACTORY_URL }}
JFROG_ARTIFACTORY_TOKEN: ${{ secrets.JFROG_ARTIFACTORY_TOKEN }}
PYPI_TOKEN: ${{ secrets.TEST_PYPI_TOKEN }}
46 changes: 46 additions & 0 deletions .github/workflows/python_deploy_prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
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
default: true
publish-pypi:
description: 'Publish PyPI package'
required: false
default: true

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-prod"]'
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: 'mira-omf'
virtual-repo-names: '["public-pypi-prod", "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