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

fix: update pyproject.toml and linter fixes #300

Merged
merged 2 commits into from
Oct 28, 2023
Merged
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
1 change: 1 addition & 0 deletions healthcare/controllers/service_request_controller.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import unicode_literals

import dateutil

import frappe
from frappe import _
from frappe.model.document import Document
Expand Down
1 change: 1 addition & 0 deletions healthcare/healthcare/custom_doctype/sales_invoice.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import frappe

from erpnext.accounts.doctype.sales_invoice.sales_invoice import SalesInvoice


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@
# For license information, please see license.txt

import frappe
from erpnext.stock.get_item_details import get_item_details
from erpnext.stock.stock_ledger import get_previous_sle
from frappe import _
from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc
from frappe.utils import flt, get_link_to_form, now_datetime, nowdate, nowtime

from erpnext.stock.get_item_details import get_item_details
from erpnext.stock.stock_ledger import get_previous_sle

from healthcare.healthcare.doctype.healthcare_settings.healthcare_settings import get_account
from healthcare.healthcare.doctype.lab_test.lab_test import create_sample_doc
from healthcare.healthcare.doctype.nursing_task.nursing_task import NursingTask
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@


import frappe
from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
from frappe.tests.utils import FrappeTestCase
from frappe.utils import add_days, nowdate

from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile

from healthcare.healthcare.doctype.patient_appointment.test_patient_appointment import (
create_appointment,
create_healthcare_docs,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@


import frappe
from erpnext.accounts.party import validate_party_accounts
from frappe import _
from frappe.contacts.address_and_contact import (
delete_contact_and_address,
Expand All @@ -14,6 +13,8 @@
from frappe.model.naming import append_number_if_name_exists
from frappe.utils import get_link_to_form

from erpnext.accounts.party import validate_party_accounts


class HealthcarePractitioner(Document):
def onload(self):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@
import datetime

import frappe
from erpnext.stock.utils import get_latest_stock_qty
from frappe import _
from frappe.model.document import Document
from frappe.utils import flt, get_link_to_form, get_time, getdate

from erpnext.stock.utils import get_latest_stock_qty

from healthcare.healthcare.doctype.healthcare_settings.healthcare_settings import get_account


Expand Down
6 changes: 4 additions & 2 deletions healthcare/healthcare/doctype/nursing_task/nursing_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@
# For license information, please see license.txt
import json

from six import string_types

import frappe
from erpnext import get_default_company
from frappe import _
from frappe.model.document import Document
from frappe.utils import add_to_date, get_datetime, getdate, now_datetime, time_diff_in_seconds
from six import string_types

from erpnext import get_default_company


class NursingTask(Document):
Expand Down
8 changes: 5 additions & 3 deletions healthcare/healthcare/doctype/patient/patient.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@


import dateutil

import frappe
from erpnext import get_default_currency
from erpnext.accounts.party import get_dashboard_info
from erpnext.selling.doctype.customer.customer import make_address
from frappe import _
from frappe.contacts.address_and_contact import load_address_and_contact
from frappe.contacts.doctype.contact.contact import get_default_contact
Expand All @@ -16,6 +14,10 @@
from frappe.utils import cint, cstr, getdate
from frappe.utils.nestedset import get_root_of

from erpnext import get_default_currency
from erpnext.accounts.party import get_dashboard_info
from erpnext.selling.doctype.customer.customer import make_address

from healthcare.healthcare.doctype.healthcare_settings.healthcare_settings import (
get_income_account,
get_receivable_account,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
import json

import frappe
from erpnext.setup.doctype.employee.employee import is_holiday
from frappe import _
from frappe.core.doctype.sms_settings.sms_settings import send_sms
from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc
from frappe.utils import flt, format_date, get_link_to_form, get_time, getdate

from erpnext.setup.doctype.employee.employee import is_holiday

from healthcare.healthcare.doctype.fee_validity.fee_validity import (
check_fee_validity,
get_fee_validity,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
import datetime

import frappe
from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
from frappe.tests.utils import FrappeTestCase
from frappe.utils import add_days, flt, get_time, getdate, now_datetime, nowdate

from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile

from healthcare.healthcare.doctype.patient_appointment.patient_appointment import (
check_is_new_patient,
check_payment_reqd,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@


import frappe
from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile
from frappe.tests.utils import FrappeTestCase
from frappe.utils import add_days, nowdate

from erpnext.accounts.doctype.pos_profile.test_pos_profile import make_pos_profile

from healthcare.healthcare.doctype.patient_appointment.test_patient_appointment import (
create_appointment,
create_encounter,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@

import json

from six import string_types

import frappe
from frappe import _
from six import string_types

from healthcare.controllers.service_request_controller import ServiceRequestController

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@

import unittest

import erpnext
import frappe
from frappe.utils import getdate, nowtime

import erpnext

from healthcare.healthcare.doctype.healthcare_settings.healthcare_settings import (
get_income_account,
get_receivable_account,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
# For license information, please see license.txt

import frappe
from erpnext.accounts.utils import get_fiscal_year
from frappe import _, scrub
from frappe.database.query import OPERATOR_MAP
from frappe.utils import add_days, add_to_date, flt, getdate

from erpnext.accounts.utils import get_fiscal_year


def execute(filters=None):
return DiagnosisTrends(filters).run()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@


import frappe
from erpnext.accounts.utils import get_fiscal_year
from frappe import _, scrub
from frappe.utils import add_days, add_to_date, flt, getdate

from erpnext.accounts.utils import get_fiscal_year


def execute(filters=None):
return Analytics(filters).run()
Expand Down
3 changes: 2 additions & 1 deletion healthcare/healthcare/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
import math

import frappe
from erpnext.setup.utils import insert_record
from frappe import _
from frappe.utils import cstr, flt, get_link_to_form, rounded, time_diff_in_hours
from frappe.utils.formatters import format_value

from erpnext.setup.utils import insert_record

from healthcare.healthcare.doctype.healthcare_settings.healthcare_settings import (
get_income_account,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import click

import frappe


Expand Down
3 changes: 2 additions & 1 deletion healthcare/regional/india/abdm/test_abdm.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import frappe
import responses

import frappe
from frappe.tests.utils import FrappeTestCase

from healthcare.regional.india.abdm.utils import abdm_request
Expand Down
3 changes: 2 additions & 1 deletion healthcare/regional/india/abdm/utils.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import json

import frappe
import requests

import frappe

from healthcare.regional.india.abdm.abdm_config import get_url


Expand Down
1 change: 1 addition & 0 deletions healthcare/setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# isort: skip_file
import frappe
from erpnext.setup.utils import insert_record
from frappe import _
Expand Down
1 change: 1 addition & 0 deletions healthcare/uninstall.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import click

import frappe

from healthcare.setup import before_uninstall as remove_customizations
Expand Down
22 changes: 22 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,33 @@
[project]
name = "healthcare"
description = "Modern, Open Source HIS built on Frappe and ERPNext"
authors = [
{ name = "earthians Health Informatics Pvt. Ltd.", email = "[email protected]" }
]
readme = "README.md"
dynamic = ["version"]

dependencies = [
"responses==0.20.0",
]

[build-system]
requires = ["flit_core >=3.4,<4"]
build-backend = "flit_core.buildapi"

[tool.black]
line-length = 99

[tool.isort]
profile = "black"
line_length = 99
multi_line_output = 3
include_trailing_comma = true
force_grid_wrap = 0
use_parentheses = true
ensure_newline_before_comments = true
indent = "\t"
known_frappe = ["frappe"]
known_erpnext = ["erpnext"]
known_healthcare = ["healthcare"]
sections = ["FUTURE", "STDLIB", "THIRDPARTY", "FRAPPE", "ERPNEXT", "HEALTHCARE", "FIRSTPARTY", "LOCALFOLDER"]
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# isort: skip_file
from setuptools import find_packages, setup

with open("requirements.txt") as f:
Expand Down