Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,630 Commits 6 Branches 99 Tags 484 MiB
4bbf168393
Commit Graph

165 Commits

Author SHA1 Message Date
Oliver
b9fd263899
Docker improvements (#3042) 
* Simplified dockerfile

- Changed from alpine to python:slim
- Removed some database libs (because we *connect* to a db, not host it)

* - Add gettext as required package
- Only create inventree user as part of production build (leave admin access for dev build)

* Tweaks for tasks.py

* Fix user permissions (drop to inventree user)

* Drop to the 'inventree' user level as part of init.sh

- As we have mounted volumes at 'run time' we need to ensure that the inventree user has correct permissions!
- Ref: https://stackoverflow.com/questions/39397548/how-to-give-non-root-user-in-docker-container-access-to-a-volume-mounted-on-the

* Adjust user setup

- Only drop to non-root user as part of "production" build
- Mounted external volumes make it tricky when in the dev build
- Might want to revisit this later on

* More dockerfile changes

- reduce required system packages
-

* Add new docker github workflow

* Print some more debug

* GITHUB_BASE_REF

* Add gnupg to base requirements

* Improve debug output during testing

* Refactoring updates for label printing API

- Update weasyprint version to 55.0
- Generate labels as pdf files
- Provide filename to label printing plugin
- Additional unit testing
- Improve extraction of some hidden debug data during TESTING
- Fix a spelling mistake (notifaction -> notification)

* Working on github action

* More testing

* Add requirement for pdf2image

* Fix label printing plugin and update unit testing

* Add required packages for CI

* Move docker files to the top level directory

- This allows us to build the production image directly from soure
- Don't need to re-download the source code from github
- Note: The docker install guide will need to be updated!

* Fix for docker ci file

* Print GIT SHA

* Bake git information into the production image

* Add some exta docstrings to dockerfile

* Simplify version check script

* Extract git commit info

* Extract docker tag from check_version.py

* Newline

* More work on the docker workflow

* Dockerfile fixes

- Directory / path issues

* Dockerfile fixes

- Directory / path issues

* Ignore certain steps on a pull request

* Add poppler-utils to CI

* Consolidate version check into existing CI file

* Don't run docker workflow on pull request

* Pass docker image tag through to the build

Also check .j2k files

* Add supervisord.conf example file back in

* Remove --no-cache-dir option from pip install
 2022-05-29 09:40:37 +10:00
Matthias
3fd5761089
Merge branch 'master' of https://github.com/inventree/InvenTree into devOps 2022-05-18 23:39:58 +02:00
Oliver Walters
dc2351748c Merge remote-tracking branch 'inventree/master' into webp-support 2022-05-17 18:48:19 +10:00
Matthias
545756eacb
add docstring testing 2022-05-16 01:20:04 +02:00
Matthias
af6eac8cc9
Add isort 2022-05-16 01:12:19 +02:00
Matthias
f1553337f7
add pre-commit 2022-05-16 00:15:25 +02:00
Oliver Walters
495798dc98 Install libwebp-dev as part of dockerfile 2022-05-15 23:20:12 +10:00
Kalman Rozsahegyi
32febb010c Fix a wrong merge in requirements.txt 2022-04-28 22:15:11 +02:00
Kalman Rozsahegyi
9e1a143132 Merge branch 'master' into feat-qr-scanner 2022-04-28 22:14:11 +02:00
Kalman Rozsahegyi
5b5a39568b Merge branch 'master' into feat-qr-scanner 2022-04-28 22:09:01 +02:00
Oliver
27c807492d Security patch for django 2022-04-21 11:45:09 +10:00
Oliver Walters
7c126ed712 Added x_forwarded_for middleware 
Used to extract remote client IP (when behind balancer / proxy / etc)
 2022-04-19 21:19:25 +10:00
Oliver Walters
9e59d90e0e Pin bleach package version 
(cherry picked from commit 7af9e9123e)
 2022-04-10 20:24:41 +10:00
Kálmán Rózsahegyi
84717f8103 Add secure development server in DEBUG mode 2022-03-26 19:41:51 +01:00
dependabot[bot]
4d2d001879
Bump pillow from 9.0.0 to 9.0.1 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/9.0.0...9.0.1)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-11 23:46:05 +00:00
Oliver
9ad0b66ebc Update base django version 2022-02-10 13:13:51 +11:00
dependabot[bot]
1927daa56d
Bump django from 3.2.10 to 3.2.11 
Bumps [django](https://github.com/django/django) from 3.2.10 to 3.2.11.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.10...3.2.11)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 02:26:20 +00:00
dependabot[bot]
f997e092b1
Bump pillow from 8.3.2 to 9.0.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.3.2...9.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 01:11:42 +00:00
Oliver
11d3cd3c0c Change dev environment setup to use postgresql 
- sqlite causes too many errors
- fix requirements file
- fixes for docker setup
- A lot of concurrency issues
- Bite the bullet, time to go!
 2021-12-21 00:34:23 +11:00
dependabot[bot]
f9b1305f9c
Bump django from 3.2.5 to 3.2.10 
Bumps [django](https://github.com/django/django) from 3.2.5 to 3.2.10.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.5...3.2.10)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-12 10:06:07 +00:00
Matthias
3a3f8ba4ef
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-12-08 18:31:33 +01:00
Matthias
0f0460f8ea
merge 2021-12-02 17:24:07 +01:00
Matthias Mair
11e527a02a
Merge branch 'inventree:master' into plugin-2037 2021-12-02 09:23:05 +01:00
Matthias
db1a434f81
[FR] User sessions 
Fixes #2327
 2021-11-26 23:56:24 +01:00
Matthias
eee9047818
[FR] Two-Factor Authentication 
Fixes #2201
 2021-11-19 23:48:12 +01:00
Matthias
a95b298c62
Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-18 11:37:11 +01:00
Oliver
c0f5205570 Pin markdown package version 2021-11-17 10:56:39 +11:00
Matthias
b783ec566c
add maintenance mode 2021-11-15 22:07:30 +01:00
Matthias
b54f9c9c13
provide backport for 3.7 2021-11-04 10:24:05 +01:00
Matthias
aa7b78f41d
Adding in MFA 
Fixes #2201
 2021-10-27 21:35:00 +02:00
Nigel
0997ba2eb4
Sort requirements.txt 2021-10-14 14:38:31 -06:00
Oliver
7d88cbe27e Tag specific version of cryptography 2021-10-14 09:25:00 +11:00
Matthias Mair
44c5003839
Merge branch 'inventree:master' into fr-1421-sso 2021-09-24 00:32:38 +02:00
dependabot[bot]
1d85ccd543
Build(deps): Bump django from 3.2.4 to 3.2.5 
Bumps [django](https://github.com/django/django) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.4...3.2.5)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-22 17:46:34 +00:00
Oliver
20788bb559 Bump pillow version for security fix 2021-09-08 13:02:49 +10:00
Oliver
84528df6f8 Re-add gunicorn to requirements file 2021-09-08 08:01:05 +10:00
Matthias
1311558cac
add in SSO for #1421 2021-08-24 19:12:43 +02:00
Oliver
c2af401854 Pin base python package requirements 
- Require invoke to be installed before we can run "invoke update"
 2021-08-18 12:03:24 +10:00
Oliver
7df4451c08 Move some core pypi deps into requirements file 2021-08-12 22:06:47 +10:00
Oliver
fa6daeb679 Pin weasyprint version to 52.5 2021-08-05 10:30:38 +10:00
dependabot[bot]
0bc190bca5
Build(deps): Bump django from 3.2.2 to 3.2.4 
Bumps [django](https://github.com/django/django) from 3.2.2 to 3.2.4.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.2...3.2.4)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-10 17:36:17 +00:00
dependabot[bot]
6e2abc4cde
Build(deps): Bump django from 3.2.1 to 3.2.2 
Bumps [django](https://github.com/django/django) from 3.2.1 to 3.2.2.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.1...3.2.2)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-09 17:26:23 +00:00
dependabot[bot]
2a059f345e
Build(deps): Bump pillow from 8.1.1 to 8.2.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 19:49:34 +00:00
Oliver
172700da10 Update django-import-export to 2.5.0 
- Fixes an export error introduced after updating to latest django
 2021-06-07 00:12:52 +10:00
dependabot[bot]
7d7e518c1b
Bump django from 3.2 to 3.2.1 
Bumps [django](https://github.com/django/django) from 3.2 to 3.2.1.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2...3.2.1)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-04 21:37:26 +00:00
Oliver Walters
4abd3524b4 Looks like py-moneyed has been updated 2021-05-27 12:59:30 +10:00
eeintech
7e6ac54015 YAML does not get installed during django-import-export package? 2021-05-11 14:13:21 -04:00
eeintech
ba561d6d19 Fixed import for excel formats 2021-05-11 14:06:38 -04:00
eeintech
b847604f15 Started implementation of multi-step form for purchase order file uplod 2021-05-03 17:30:33 -04:00
Oliver Walters
b08cd8da20 Remove dbbackup integration 
- Data dumping and restoring is now very complex!
- We should use the invoke export-records function now, rather than relying on dbbackup / dbrestore
- Documentation will be updated to match
 2021-04-25 12:14:36 +10:00
Oliver Walters
6b9145ae56 Fixes required for v3.2 compatibility 
- Specify DEFAULT_AUTO_FIELD
- Specify output_field for annotations
 2021-04-20 09:14:08 +10:00
Oliver Walters
12f1fb9526 Update to django 3.2 2021-04-20 08:15:43 +10:00
dependabot[bot]
716ab4872a
Bump django from 3.1.7 to 3.1.8 
Bumps [django](https://github.com/django/django) from 3.1.7 to 3.1.8.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.1.7...3.1.8)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-04-19 10:48:19 +00:00
Oliver Walters
98be42846c Update requirements 2021-04-19 12:21:43 +10:00
Oliver Walters
731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q 
# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py
 2021-03-31 22:17:38 +11:00
dependabot[bot]
49bb5634da
Bump pygments from 2.2.0 to 2.7.4 
Bumps [pygments](https://github.com/pygments/pygments) from 2.2.0 to 2.7.4.
- [Release notes](https://github.com/pygments/pygments/releases)
- [Changelog](https://github.com/pygments/pygments/blob/master/CHANGES)
- [Commits](https://github.com/pygments/pygments/compare/2.2.0...2.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-29 19:20:11 +00:00
Oliver Walters
e3f49b8996 Install invoke and gunicorn as part of requirements.txt 2021-03-24 08:31:53 +11:00
dependabot[bot]
f25c83226f
Bump djangorestframework from 3.10.3 to 3.11.2 
Bumps [djangorestframework](https://github.com/encode/django-rest-framework) from 3.10.3 to 3.11.2.
- [Release notes](https://github.com/encode/django-rest-framework/releases)
- [Commits](https://github.com/encode/django-rest-framework/compare/3.10.3...3.11.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-03-19 22:23:09 +00:00
Oliver Walters
84aea1d587 Bump pillow version 2021-03-19 10:59:28 +11:00
Oliver Walters
7bec3ff5dd django-q 2021-03-06 20:58:57 +11:00
Oliver Walters
9478da2ad2 Remove django-migration-linter which was causing strange errors 2021-03-02 15:53:56 +11:00
Oliver Walters
828b3adc49 Update requirements.txt 
- Remove blabel
- Remove django-qr-code
- Add python-barcode
- Add qrcode
 2021-02-22 14:40:40 +11:00
Oliver
af7a627230
Merge pull request #1271 from SchrodingersGat/migration-unit-test 
Migration unit test
 2021-02-04 23:56:12 +11:00
Oliver Walters
59904ace1d Revoke support for LaTex reporting 2021-02-04 16:18:28 +11:00
Oliver Walters
bd9447d9aa Add django-migration-linter to ensure django migrations are tippy-top 2021-02-03 23:29:14 +11:00
Oliver Walters
1d317b1ecb Add django-test-migrations package 2021-02-03 23:16:00 +11:00
Oliver Walters
220777611a Prevent part images from auto deleting 
- Part images can be used for multiple parts
 2021-01-27 22:31:21 +11:00
Oliver Walters
ae7fbd6112 Add PEP8-naming extension for flake 
- Enforcing python naming checks
 2020-11-12 21:53:04 +11:00
Oliver Walters
cb3c86f87a Merge remote-tracking branch 'inventree/master' into currency-support 
# Conflicts:
#	InvenTree/InvenTree/settings.py
#	InvenTree/InvenTree/urls.py
#	InvenTree/templates/InvenTree/settings/tabs.html
#	InvenTree/users/models.py
#	requirements.txt

IMPORTANT: Had to merge some migration files due to different migrations applied on the part model tables
 2020-11-12 17:24:48 +11:00
Oliver Walters
6c667937c5 Add requirement for django-error-report 
- Provides an error log viewer in the admin interface at /admin/error_report/error/
- Allows viewing of error logs even in a remote production environment (i.e. no access to command line)
 2020-11-11 14:10:12 +11:00
Oliver Walters
4dff18e4a6 Remove common_currency model entirely 
- A lot of views / pages / etc needed to be updated too
- Now uses django-money fields entirely
- Create a manual rate exchange backend (needs more work!)
 2020-11-11 00:21:06 +11:00
Oliver Walters
734436b02e Add integration of django-money 
- Proper currency support
- Add PurchasePrice field to StockItem model
- This keeps track of both the price and the currency
- Display purchase price on the stockitem detail page
 2020-11-10 16:22:42 +11:00
Oliver Walters
5f6f722d6c Change from python-coveralls to coveralls 2020-11-04 13:30:17 +11:00
Oliver Walters
f8da15287c Updated to latest version of coverage and coveralls 2020-11-04 09:35:43 +11:00
Oliver Walters
c7403fd512 Add shell interface 2020-10-03 16:18:03 +10:00
Oliver Walters
42967905bc New approach for multiple annotations 
- Use the django-sql-utils addon - https://github.com/martsberger/django-sql-utils
- The "distinct=True" flag was not doing what I thought it was doing...
 2020-09-05 22:35:19 +10:00
Oliver Walters
8615cad711 Stock: Fix serializers.py 
- Use of read_only PrimaryKeyRelatedField was breaking POST via API
 2020-08-31 20:08:07 +10:00
Oliver Walters
eabb99053c Update requirements.txt 2020-08-31 19:20:16 +10:00
Oliver Walters
05fae4be87 Are more methods to tasks.py: 
- static
- update
- install
- key
- coverage

The functionality of setup.py is now included here!
 2020-08-21 21:08:04 +10:00
Oliver Walters
dd77cc00b7 Add requirement for "blabel" plugin 2020-08-16 09:07:27 +10:00
Oliver Walters
b8b3a933ab Add django-debug-toolbar plugin 
- Must be running in DEBUG mode
- Must set debug_toolbar to True in config file
 2020-08-15 19:48:42 +10:00
Oliver Walters
54c1f2d9a2 Upgrade to latest flake8 2020-08-08 09:15:45 +10:00
Oliver Walters
481eeb8338 Update requirements.txt 2020-08-03 19:36:41 +10:00
Oliver Walters
84362ea790 Update django version 2020-06-06 08:27:13 +10:00
Oliver Walters
b93ba6339a Option for rendering HTML template 2020-05-21 23:41:47 +10:00
Oliver Walters
9b882f4d17 Update to latest version of django-qr-code 2020-04-27 09:17:17 +10:00
Oliver Walters
c5b93e2392 Update pillow version 
- Addresses a security patch requirement
 2020-04-24 20:40:56 +10:00
Oliver Walters
5233281a24 Should have checked first :'( 
New tablib is broked (at least in the admin interface)
 2020-04-20 00:19:04 +10:00
Oliver Walters
468eba1759 Update PIP requirements 
- django-mptt required updating to fix a bug where tree was not being rebuild on item save
 2020-04-20 00:16:57 +10:00
Oliver Walters
ff91c4ec53 Add a new verision of django-qr-code 
Official package does not (yet) support django 3.0
 2020-04-20 00:10:16 +10:00
Oliver Walters
85d1c585c0 Update to django3! 
- This is required to fix some issues with query aggregations as "distinct=True" cannot be set for Sum operations until django 3.0
- Multiple annotations on the same queryset were returning invalid results
- Ref: https://code.djangoproject.com/ticket/10060
- Ref: https://docs.djangoproject.com/en/3.0/topics/db/aggregation/#combining-multiple-aggregations
- django-dbbackup required updating for django3 support
- django-qr-code for now is disabled, a new solution needs to be worked out
 2020-04-19 22:44:16 +10:00
Oliver Walters
4594f1e2b8 Update requirements documentation 
- Add python3-dev and g++
- Add wheel to PIP requirements file
 2020-04-16 09:56:32 +10:00
Oliver Walters
aee0970e49 Part image field now uses django-stdimage 2020-04-04 15:47:05 +11:00
maxbachmann
b162c97226
use rapidfuzz instead of fuzzywuzzy 2020-03-22 22:31:15 +01:00
dependabot[bot]
8a42d9f2fa
Bump django from 2.2.9 to 2.2.10 
Bumps [django](https://github.com/django/django) from 2.2.9 to 2.2.10.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.9...2.2.10)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-12 03:32:31 +00:00
Oliver
5261e96c8a
Revert to django 2.2.9 
2.2.10 causes issues

```ModuleNotFoundError: No module named 'django.utils'```
 2020-02-12 14:32:09 +11:00
dependabot[bot]
05f7b30ab0
Bump django from 2.2.9 to 2.2.10 
Bumps [django](https://github.com/django/django) from 2.2.9 to 2.2.10.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.9...2.2.10)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-12 00:09:16 +00:00
Oliver Walters
c546ed5dcd Update requirements 
- Use markdownify for rendering
- Use markdownx for editing
 2020-01-31 21:42:30 +11:00
Oliver Walters
596d06cf1a Add a markdown editor for the 'Notes" field of Part model 
https://github.com/timmyomahony/django-pagedown
 2020-01-31 20:28:54 +11:00
Oliver Walters
442c6e8b27 Update django version 2020-01-19 21:33:24 +11:00