Skip to content

Commit

Permalink
Merge pull request #153 from sparkmicro/1.0.x
Browse files Browse the repository at this point in the history
1.0.1
  • Loading branch information
eeintech authored Apr 24, 2023
2 parents 8e0ae07 + c5e7389 commit 322f40f
Show file tree
Hide file tree
Showing 18 changed files with 132 additions and 324 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test_deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ jobs:
mkdir -p ~/.config/kintree/user/ && mkdir -p ~/.config/kintree/cache/search/
cp tests/files/inventree_dev.yaml ~/.config/kintree/user/
cp tests/files/kicad_map.yaml ~/.config/kintree/user/
cp tests/files/digikey_config.yaml ~/.config/kintree/user/
cp tests/files/results.tgz ~/.config/kintree/cache/search/
cd ~/.config/kintree/cache/search/ && tar xvf results.tgz && cd -
- name: GUI test
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,9 @@ Note that each time you enable the "Add" permission to an object, InvenTree auto
2. Click on "Settings > Supplier > Mouser" and fill in the Mouser part search API key
3. Click on "Settings > Supplier > Element14" and fill in the Element14 product search API key (key is shared with Farnell and Newark)
4. Click on "Settings > KiCad", browse to the location where KiCad symbol, template and footprint libraries are stored on your computer then click "Save"
5. If you intend to use InvenTree with this tool, click on "Settings > InvenTree" and fill in your InvenTree server address and credentials then click "Save" (optional: click on "Test" to check communication with server)
i. It is possible to define a Proxy Server over which all interactions with InvenTree will be routed. To set a proxy server use the "Enable Proxy Support" switch in "Settings > InvenTree" and define the proxy address in the new input field.
ii. Instead of user credential authentication token authentication is also supported. To use a token add it it to the "Password or Token" field and leave the "Username" empty. You can retrieve your personal access token from your InvenTree server by sending an get-request to its api url `api/user/token/`.
5. If you intend to use InvenTree with this tool, click on "Settings > InvenTree" and fill in your InvenTree server address and credentials then click "Save" (optional: click on "Test" to check communication with server)
a. It is possible to define a Proxy Server over which all interactions with InvenTree will be routed. To set a proxy server use the "Enable Proxy Support" switch in "Settings > InvenTree" and define the proxy address in the new input field.
b. Instead of user credential authentication token authentication is also supported. To use a token add it it to the "Password or Token" field and leave the "Username" empty. You can retrieve your personal access token from your InvenTree server by sending an get-request to its api url `api/user/token/`.


#### Get Digi-Key API token
Expand Down
3 changes: 2 additions & 1 deletion kintree/config/digikey/digikey_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ SEARCH_SKU: null
SEARCH_MANUFACTURER: null
SEARCH_MPN: null
SEARCH_SUPPLIER_URL: null
SEARCH_DATASHEET: null
SEARCH_DATASHEET: null
EXTRA_FIELDS: null
273 changes: 0 additions & 273 deletions kintree/config/digikey/digikey_parameters.yaml

This file was deleted.

3 changes: 2 additions & 1 deletion kintree/config/element14/element14_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ SEARCH_SKU: null
SEARCH_MANUFACTURER: null
SEARCH_MPN: null
SEARCH_SUPPLIER_URL: null
SEARCH_DATASHEET: null
SEARCH_DATASHEET: null
EXTRA_FIELDS: null
3 changes: 3 additions & 0 deletions kintree/config/inventree/inventree_dev.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
ENABLE: true
ENABLE_PROXY: false
PASSWORD: !!binary |
''
PROXIES: null
SERVER_ADDRESS: ''
USERNAME: ''
3 changes: 3 additions & 0 deletions kintree/config/inventree/inventree_prod.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
ENABLE: true
ENABLE_PROXY: false
PASSWORD: !!binary |
''
PROXIES: null
SERVER_ADDRESS: ''
USERNAME: ''
3 changes: 2 additions & 1 deletion kintree/config/lcsc/lcsc_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ SEARCH_SKU: null
SEARCH_MANUFACTURER: null
SEARCH_MPN: null
SEARCH_SUPPLIER_URL: null
SEARCH_DATASHEET: null
SEARCH_DATASHEET: null
EXTRA_FIELDS: null
3 changes: 2 additions & 1 deletion kintree/config/mouser/mouser_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ SEARCH_SKU: null
SEARCH_MANUFACTURER: null
SEARCH_MPN: null
SEARCH_SUPPLIER_URL: null
SEARCH_DATASHEET: null
SEARCH_DATASHEET: null
EXTRA_FIELDS: null
1 change: 0 additions & 1 deletion kintree/config/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ def load_suppliers():
CONFIG_DIGIKEY = config_interface.load_file(os.path.join(CONFIG_USER_FILES, 'digikey_config.yaml'))
CONFIG_DIGIKEY_API = os.path.join(CONFIG_USER_FILES, 'digikey_api.yaml')
CONFIG_DIGIKEY_CATEGORIES = os.path.join(CONFIG_USER_FILES, 'digikey_categories.yaml')
# CONFIG_DIGIKEY_PARAMETERS = os.path.join(CONFIG_USER_FILES, 'digikey_parameters.yaml')

# Mouser user configuration
CONFIG_MOUSER = config_interface.load_file(os.path.join(CONFIG_USER_FILES, 'mouser_config.yaml'))
Expand Down
Loading

0 comments on commit 322f40f

Please sign in to comment.