Skip to content

Commit

Permalink
Merge pull request #253 from sparkmicro/dev
Browse files Browse the repository at this point in the history
1.1.3
  • Loading branch information
eeintech authored Aug 7, 2024
2 parents e676d13 + 38588e4 commit 316a11d
Show file tree
Hide file tree
Showing 5 changed files with 259 additions and 472 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
git clone https://github.com/inventree/InvenTree/
mkdir InvenTree/static
cp tests/files/inventree_default_db.sqlite3 InvenTree/
cd InvenTree/ && git switch stable && invoke install && invoke migrate && cd -
cd InvenTree/ && git switch master && invoke install && invoke migrate && cd -
- name: Ki-nTree setup
run: |
invoke install
Expand Down
2 changes: 1 addition & 1 deletion kintree/config/inventree/supplier_parameters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ Mechanicals:
Power Management:
parent:
- Base
(Min) Output Voltage:
Min Output Voltage:
- Voltage - Output (Min/Fixed)
Frequency:
- Frequency - Switching
Expand Down
2 changes: 1 addition & 1 deletion kintree/database/inventree_interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ def get_inventree_stock_location_id(stock_location_tree: list):
return inventree_api.get_inventree_stock_location_id(stock_location_tree)


def inventree_create(part_info: dict, stock=None, kicad=False, symbol=None, footprint=None, show_progress=True, is_custom=False, enable_upload=False):
def inventree_create(part_info: dict, stock=None, kicad=False, symbol=None, footprint=None, show_progress=True, is_custom=False, enable_upload=True):
''' Create InvenTree part from supplier part data and categories '''

part_pk = 0
Expand Down
2 changes: 1 addition & 1 deletion kintree/search/lcsc_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ def test_api() -> bool:

test_success = True
expected = {
'productIntroEn': '25V 100pF C0G ±5% 0201 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS',
'productIntroEn': '25V 100pF C0G ±5% 0201 Multilayer Ceramic Capacitors MLCC - SMD/SMT ROHS',
'productCode': 'C2181718',
'brandNameEn': 'TDK',
'productModel': 'C0603C0G1E101J030BA',
Expand Down
Loading

0 comments on commit 316a11d

Please sign in to comment.