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.

Sign up for GitHub

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

Jump to bottom

Update demo data hook to copy media files #3441

Merged

SchrodingersGat merged 20 commits into inventree:master from SchrodingersGat:demo-media-files

Jul 31, 2022

Member

SchrodingersGat commented Jul 31, 2022 •

edited

Loading

Existing script for installing demo dataset does not copy across media files!

This PR started with an initially simple goal - to copy these media files across.

However to gain access to the canonical location of the MEDIA_ROOT directory, we needed some extra code to provide that information to external scripts!

This ended up leading to a significant refactor of the "settings.py" file

Documentation

Required some updates (and improvements) to the documentation, inventree/inventree-docs#342

SchrodingersGat added 8 commits

July 31, 2022 12:04


          Simplify settings.py / config.py

6251f39

- get_setting function has been streamlined
- move some functions into config.py


          Spelling fix: IGNORRED is IGNORED

f45f010


          Ensure yaml is installed as part of docker image

932182e

- invoke path is still mucking us around


          Fix broken migration

dd4517c


          Copy media files from demo dataset when installing test data

14b043f


          Cleanup settings.py

8b02490


          Fix for configuration file traversal

4b43ccc


          Line fix

f3ce1d1

SchrodingersGat added the setup label

SchrodingersGat added this to the 0.8.0 milestone

SchrodingersGat requested a review from matmair

July 31, 2022 07:23

SchrodingersGat added the breaking label

SchrodingersGat added 8 commits

July 31, 2022 18:38


          Update quickstart guide for docker

515f1f1


          Allow plugin file and plugin dir to be specified in configuration file

32646cc


          Cleanup config template file

7d2d8ee


          Allow secret_key information to be provided in configuration file

d9c7fbb


          Adjust root paths for CI tests

3c6e3d2


          resolve paths

ab6d86c


          Revert paths for CI step

ea36c6b


          remove dead code

7f1eb01

SchrodingersGat mentioned this pull request

Update configuration documentation inventree/inventree-docs#342

Merged

matmair approved these changes

View reviewed changes

Member

matmair left a comment

@SchrodingersGat not sure if i am miss understanding something but a bunch of config.yaml names seem to be renamed. This PR is highly breaking configs of that is the case.

InvenTree/InvenTree/config.py Show resolved Hide resolved

InvenTree/InvenTree/config.py Outdated

Comment on lines 203 to 204

		with open(secret_key_file, 'r') as f:
		key_data = f.read().strip()

Member

matmair Jul 31, 2022

Suggested change

      
                with open(secret_key_file, 'r') as f:
          
                    key_data = f.read().strip()
          
                key_data=secret_key_file.read_text().strip()

Member Author

SchrodingersGat Jul 31, 2022

Thanks, fixed in d17e3dc

InvenTree/InvenTree/settings.py Outdated

    
                  'workers': background_workers,

                  'timeout': 90,

                  'workers': int(get_setting('INVENTREE_BACKGROUND_WORKERS', 'background.workers', 4)),

                  'timeout': int(get_setting('INVENTREE_BACKGROUND_TIMEOUT', 'background.timeout', 4)),

Member

matmair Jul 31, 2022

Question: the old default was 90; why the change?

Member Author

SchrodingersGat Jul 31, 2022

Because "whoops". Fixed in 2492811. Thanks!

InvenTree/InvenTree/settings.py Outdated

@@ @@ -856,8 +718,8 @@ def _is_true(x): @@
               SOCIALACCOUNT_STORE_TOKENS = True
               # settings for allauth
-              ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = get_setting('INVENTREE_LOGIN_CONFIRM_DAYS', CONFIG.get('login_confirm_days', 3))
-              ACCOUNT_LOGIN_ATTEMPTS_LIMIT = get_setting('INVENTREE_LOGIN_ATTEMPTS', CONFIG.get('login_attempts', 5))
+              ACCOUNT_EMAIL_CONFIRMATION_EXPIRE_DAYS = get_setting('INVENTREE_LOGIN_CONFIRM_DAYS', 'login.confirm_days', 3)

Member

matmair Jul 31, 2022

Question: is this a breaking change in the config file?

Member Author

SchrodingersGat Jul 31, 2022

Should be fixed now thanks for pointing out.

InvenTree/InvenTree/settings.py Outdated

@@ @@ -877,8 +739,8 @@ def _is_true(x): @@
               ACCOUNT_ADAPTER = 'InvenTree.forms.CustomAccountAdapter'
               # login settings
-              REMOTE_LOGIN = get_setting('INVENTREE_REMOTE_LOGIN', CONFIG.get('remote_login', False))
-              REMOTE_LOGIN_HEADER = get_setting('INVENTREE_REMOTE_LOGIN_HEADER', CONFIG.get('remote_login_header', 'REMOTE_USER'))
+              REMOTE_LOGIN = get_boolean_setting('INVENTREE_REMOTE_LOGIN', 'remote_login.enabled', False)

Member

matmair Jul 31, 2022

Question: new config path?

InvenTree/InvenTree/settings.py Outdated

    
              REMOTE_LOGIN = get_setting('INVENTREE_REMOTE_LOGIN', CONFIG.get('remote_login', False))

              REMOTE_LOGIN_HEADER = get_setting('INVENTREE_REMOTE_LOGIN_HEADER', CONFIG.get('remote_login_header', 'REMOTE_USER'))

              REMOTE_LOGIN = get_boolean_setting('INVENTREE_REMOTE_LOGIN', 'remote_login.enabled', False)

              REMOTE_LOGIN_HEADER = get_setting('INVENTREE_REMOTE_LOGIN_HEADER', 'remote_login.header', 'REMOTE_USER')

Member

matmair Jul 31, 2022

Deto

InvenTree/InvenTree/settings.py

@@ @@ -932,7 +795,7 @@ def _is_true(x): @@
                       sentry_sdk.set_tag(f'inventree_{key}', val)
               # In-database error logging
-              IGNORRED_ERRORS = [
+              IGNORED_ERRORS = [

Member

matmair Jul 31, 2022

Comment: gotta love the typos - that is how you recognize me being in a code base

InvenTree/InvenTree/settings.py Outdated

-                  CONFIG.get('customize', {}),
-                  {}
-              )
+              CUSTOMIZE = CONFIG.get('customize', {})

Member

matmair Jul 31, 2022

Question: is the env variable removed here? Seems breaking

Member Author

SchrodingersGat Jul 31, 2022

Fixed in f41af88


          Revert configuration variables to old names

805c3fc

- Prevent breaking changes

SchrodingersGat mentioned this pull request

Fix config docs inventree/inventree-docs#343

Merged

Member Author

SchrodingersGat commented Jul 31, 2022

@SchrodingersGat not sure if i am miss understanding something but a bunch of config.yaml names seem to be renamed. This PR is highly breaking configs of that is the case.

I have reverted these now, the only changes for config.yaml should only be for newly supported variables.

SchrodingersGat added 3 commits

July 31, 2022 22:10


          Simplify secret key generation

d17e3dc


          Fix default timeout for background worker process


          Revert change for customization options

f41af88

SchrodingersGat requested a review from matmair

July 31, 2022 12:15

SchrodingersGat removed the breaking label

matmair approved these changes

View reviewed changes

Member

matmair commented Jul 31, 2022

@SchrodingersGat should be good to go

SchrodingersGat merged commit e9b0f02 into inventree:master

SchrodingersGat deleted the demo-media-files branch

July 31, 2022 13:17

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

setup