Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: release v14 #559

Open
wants to merge 6 commits into
base: version-14
Choose a base branch
from
Open
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
12 changes: 6 additions & 6 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
name: Bug Report
description: Report a bug encountered while using Frappe Health
description: Report a bug encountered while using Marley Health
labels: ["bug"]

body:
- type: markdown
attributes:
value: |
Welcome to Frappe Health issue tracker! Before creating an issue, please consider the following:
Welcome to Marley Health issue tracker! Before creating an issue, please consider the following:

1. This tracker should only be used to report bugs and request features / enhancements to Frappe Health
1. This tracker should only be used to report bugs and request features / enhancements to Marley Health
- For questions and general support, checkout the [documentation](https://frappehealth.com/docs) or use the [forum](https://discuss.frappe.io/c/healthcare/58) to get inputs from the open source community.
- For documentation issues, propose edit on the [documentation site](https://frappehealth.com/docs) directly.
2. When making a bug report, make sure you provide all required information. The easier it is for
Expand All @@ -29,7 +29,7 @@ body:
id: module
attributes:
label: Module
description: Select the affected module of Frappe Health.
description: Select the affected module of Marley Health.
multiple: true
options:
- Outpatient Module
Expand All @@ -48,11 +48,11 @@ body:
id: exact-version
attributes:
label: Version
description: Share exact version number of Frappe, ERPNext and Frappe Health you are using.
description: Share exact version number of Frappe, ERPNext and Marley Health you are using.
placeholder: |
Frappe version -
ERPNext version -
Frappe Health version -
Marley Health version -
validations:
required: true

Expand Down
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
---
name: Feature Request
description: Suggest an idea to improve Frappe Health
description: Suggest an idea to improve Marley Health
labels: ["feature-request"]

body:
- type: markdown
attributes:
value: |
Welcome to Frappe Health issue tracker! Before submitting a request, please consider the following:
Welcome to Marley Health issue tracker! Before submitting a request, please consider the following:

1. This tracker should only be used to report bugs and request features / enhancements to Frappe Health
1. This tracker should only be used to report bugs and request features / enhancements to Marley Health
- For questions and general support, checkout the [documentation](https://frappehealth.com/docs) or use the [forum](https://discuss.frappe.io/c/healthcare/58) to get inputs from the open source community.
2. Use the search function before creating a new issue. Duplicates will be closed and directed to
the original discussion.
Expand All @@ -22,7 +22,7 @@ body:
1. Certified Frappe partners: https://frappe.io/partners
2. Healthcare Category on Frappe forum: https://discuss.frappe.io/c/healthcare/58
2. Developer community on Frappe forum: https://discuss.frappe.io/c/developers/5
3. Telegram group for Frappe Health development work: https://t.me/frappehealth
3. Telegram group for Marley Health development work: https://t.me/frappehealth

- type: textarea
id: problem-info
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/initiate_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This workflow is agnostic to branches. Only maintain on develop branch.
# To add/remove versions just modify the matrix.

name: Create weekly release pull requests
on:
schedule:
# 9:30 UTC => 3 PM IST Tuesday
- cron: "30 9 * * 2"
workflow_dispatch:

jobs:
stable-release:
name: Release
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
version: ["14", "15"]

steps:
- uses: octokit/request-action@v2.x
with:
route: POST /repos/{owner}/{repo}/pulls
owner: earthians
repo: marley
title: |-
"chore: release v${{ matrix.version }}"
body: "Automated release."
base: version-${{ matrix.version }}
head: version-${{ matrix.version }}-hotfix
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules

- name: Download semgrep
run: pip install semgrep==0.97.0
run: pip install semgrep

- name: Run Semgrep rules
run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness
13 changes: 7 additions & 6 deletions .github/workflows/on_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- version-14
- version-15
jobs:
release:
name: Release
Expand All @@ -23,10 +24,10 @@ jobs:
npm install @semantic-release/git @semantic-release/exec --no-save
- name: Create Release
env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GIT_AUTHOR_NAME: "Frappe PR Bot"
GIT_AUTHOR_EMAIL: "developers@frappe.io"
GIT_COMMITTER_NAME: "Frappe PR Bot"
GIT_COMMITTER_EMAIL: "developers@frappe.io"
GH_TOKEN: ${{ secrets.EARTHIANS_BOT_TOKEN }}
GITHUB_TOKEN: ${{ secrets.EARTHIANS_BOT_TOKEN }}
GIT_AUTHOR_NAME: "earthians PR Bot"
GIT_AUTHOR_EMAIL: "devs@earthianslive.com"
GIT_COMMITTER_NAME: "earthians PR Bot"
GIT_COMMITTER_EMAIL: "devs@earthianslive.com"
run: npx semantic-release
38 changes: 38 additions & 0 deletions .github/workflows/release_notes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This action:
#
# 1. Generates release notes using github API.
# 2. Strips unnecessary info like chore/style etc from notes.
# 3. Updates release info.

# This action needs to be maintained on all branches that do releases.

name: 'Release Notes'

on:
workflow_dispatch:
inputs:
tag_name:
description: 'Tag of release like v14.0.0'
required: true
type: string
release:
types: [released]

permissions:
contents: read

jobs:
regen-notes:
name: 'Regenerate release notes'
runs-on: ubuntu-latest

steps:
- name: Update notes
run: |
NEW_NOTES=$(gh api --method POST -H "Accept: application/vnd.github+json" /repos/earthians/marley/releases/generate-notes -f tag_name=$RELEASE_TAG | jq -r '.body' | sed -E '/^\* (chore|ci|test|docs|style)/d' )
RELEASE_ID=$(gh api -H "Accept: application/vnd.github+json" /repos/earthians/marley/releases/tags/$RELEASE_TAG | jq -r '.id')
gh api --method PATCH -H "Accept: application/vnd.github+json" /repos/earthians/marley/releases/$RELEASE_ID -f body="$NEW_NOTES"

env:
GH_TOKEN: ${{ secrets.RELEASE_TOKEN }}
RELEASE_TAG: ${{ github.event.inputs.tag_name || github.event.release.tag_name }}
3 changes: 1 addition & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ pull_request_rules:
conditions:
- and:
- author!=Sajinsr
- author!=akashkrishna619
- author!=akurungadam
- author!=frappe-pr-bot
- author!=earthians-pr-bot
- author!=mergify[bot]
- author!=github-actions[bot]
- or:
Expand Down
24 changes: 24 additions & 0 deletions .releaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"branches": ["version-14", "version-15"],
"plugins": [
"@semantic-release/commit-analyzer", {
"preset": "angular",
"releaseRules": [
{"breaking": true, "release": false}
]
},
"@semantic-release/release-notes-generator",
[
"@semantic-release/exec", {
"prepareCmd": 'sed -ir "s/[0-9]*\.[0-9]*\.[0-9]*/${nextRelease.version}/" healthcare/__init__.py'
}
],
[
"@semantic-release/git", {
"assets": ["healthcare/__init__.py"],
"message": "chore(release): Bumped to Version ${nextRelease.version}\n\n${nextRelease.notes}"
}
],
"@semantic-release/github"
]
}
26 changes: 20 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
## Frappe Health
<div align="center">
<a href="https://frappehealth.com/home">
<img src="https://raw.githubusercontent.com/frappe/healthcare/develop/healthcare/public/images/healthcare.svg" height="128" alt="Marley Health Logo">
</a>
<h2>Marley Health</h2>
<p align="center">
<p>Open source & easy-to-use hospital information system(HIS) for all healthcare organisations.</p>
</p>

Open source & easy-to-use hospital information system(HIS) for all healthcare organisations.
[Marley Health](https://frappehealth.com/home)

<div align="center" style="max-height: 40px;">
<a href="https://frappecloud.com/marley/signup">
<img src=".github/try-on-f-cloud-button.svg" height="40">
</a>
</div>

</div>

### Introduction

Frappe Health enables the health domain in ERPNext and has various features that will help healthcare practitioners, clinics and hospitals to leverage the power of Frappe and ERPNext. It is built on Frappe, a full-stack, meta-data driven, web framework, and integrates seamlessly with ERPNext, the most agile ERP software. Frappe Health helps to manage healthcare workflows efficiently and most of the design is based on HL7 FHIR (Fast Health Interoperability Resources).
Marley Health enables the health domain in ERPNext and has various features that will help healthcare practitioners, clinics and hospitals to leverage the power of Frappe and ERPNext. It is built on Frappe, a full-stack, meta-data driven, web framework, and integrates seamlessly with ERPNext, the most agile ERP software. Marley Health helps to manage healthcare workflows efficiently and most of the design is based on HL7 FHIR (Fast Health Interoperability Resources).


### Key Features
Expand Down Expand Up @@ -36,14 +50,14 @@ $ bench --site demo.com install-app healthcare

### Documentation

Complete documentation for Frappe Health is available at https://frappehealth.com/docs
Complete documentation for Marley Health is available at https://frappehealth.com/docs


### License

GNU GPL V3. See [license.txt](https://github.com/frappe/health/blob/develop/license.txt) for more information.
GNU GPL V3. See [license.txt](https://github.com/earthians/marley/blob/develop/license.txt) for more information.


### Credits

Frappe Health module is initially developed by Earthians. Currently, it is developed & maintained by Frappe Team and community contributors.
Marley Health module is developed & maintained by Earthians and community contributors.
6 changes: 3 additions & 3 deletions healthcare/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
from . import __version__ as app_version # noqa

app_name = "healthcare"
app_title = "Healthcare"
app_publisher = "healthcare"
app_description = "healthcare"
app_title = "Marley Health"
app_publisher = "earthians Health Informatics Pvt. Ltd."
app_description = "Modern, Open Source HIS built on Frappe and ERPNext"
app_icon = "octicon octicon-file-directory"
app_color = "grey"
app_email = "contact@frappe.io"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import click
import frappe


def execute():
frappe_v = frappe.get_attr("frappe" + ".__version__")
healthcare_v = frappe.get_attr("healthcare" + ".__version__")

WIKI_URL = "https://github.com/frappe/health/wiki/changes-to-branching-and-versioning"

if frappe_v.startswith("14") and healthcare_v.startswith("15"):
message = f"""
The `develop` branch of Marley Health is no longer compatible with Frappe & ERPNext's `version-14`.
Since you are using ERPNext/Frappe `version-14` please switch Marley Health app's branch to `version-14` and then proceed with the update.\n\t
You can switch the branch by following the steps mentioned here: {WIKI_URL}
"""
click.secho(message, fg="red")

frappe.throw(message) # nosemgrep
6 changes: 3 additions & 3 deletions healthcare/uninstall.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@

def before_uninstall():
try:
print("Removing customizations created by Frappe Health...")
print("Removing customizations created by Marley Health...")
remove_customizations()

except Exception as e:
BUG_REPORT_URL = "https://github.com/frappe/health/issues/new"
click.secho(
"Removing Customizations for Frappe Health failed due to an error."
"Removing Customizations for Marley Health failed due to an error."
" Please try again or"
f" report the issue on {BUG_REPORT_URL} if not resolved.",
fg="bright_red",
)
raise e

click.secho("Frappe Health app customizations have been removed successfully...", fg="green")
click.secho("Marley Health app customizations have been removed successfully...", fg="green")


def after_uninstall():
Expand Down
Binary file modified key-features.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading