diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..f052884 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "monthly" + target-branch: "development" diff --git a/asterism/models.py b/asterism/models.py index ef598a4..41a5545 100644 --- a/asterism/models.py +++ b/asterism/models.py @@ -1,4 +1,3 @@ -from django.contrib.postgres.fields import JSONField from django.db import models @@ -30,7 +29,7 @@ class BasePackage(models.Model): default='aurora') PROCESS_STATUS_CHOICES = (None) process_status = models.IntegerField(choices=PROCESS_STATUS_CHOICES) - data = JSONField(null=True, blank=True) + data = models.JSONField(null=True, blank=True) created = models.DateTimeField(auto_now_add=True) last_modified = models.DateTimeField(auto_now=True) diff --git a/requirements.txt b/requirements.txt index 8b94c9d..8e5266e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -bagit==1.7.0 -django==2.2.10 -djangorestframework==3.11.0 -odin==1.5.1 -psycopg2-binary==2.8.4 +bagit==1.8.1 +django==3.2 +djangorestframework==3.12.4 +odin==1.5.2 +psycopg2-binary==2.8.6 diff --git a/setup.py b/setup.py index 3131fd9..1f1f5f7 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ long_description = fh.read() setup(name='asterism', - version='0.6.2', + version='0.7', description='Helpers for Project Electron infrastructure', long_description=long_description, long_description_content_type="text/markdown", @@ -21,9 +21,10 @@ packages=find_packages(), test_suite='nose.collector', tests_require=[ - 'nose', 'bagit', 'django', 'djangorestframework', - 'psycopg2-binary'], + 'psycopg2-binary', + 'nose', + 'odin'], zip_safe=False) diff --git a/tox.ini b/tox.ini index 21b811d..3619392 100644 --- a/tox.ini +++ b/tox.ini @@ -15,7 +15,7 @@ select = B, C, E, F, W, B950 import-order-style = pep8 max-complexity = 10 ignore = - E501 # Line too long (82 > 79 characters). Linter enforemcent is not necessary, as longer lines can improve code quality + E501 # Line too long (82 > 79 characters). Linter enforcement is not necessary, as longer lines can improve code quality W391 # Blank line at end of file # Other common exceptions to consider: # E203 Ignores Whitespace before ':'