Skip to content
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

Updating dependency management #34

Merged
merged 6 commits into from
Apr 14, 2021
Merged

Updating dependency management #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
13b2938
correct spelling error
helrond Apr 14, 2021
4d97abf
update dependencies
helrond Apr 14, 2021
3741992
use jsonfield from models
helrond Apr 14, 2021
059c6a6
add dependabot config
helrond Apr 14, 2021
20d87c6
Merge pull request #33 from RockefellerArchiveCenter/dependencies
helrond Apr 14, 2021
7e99a07
bump version
helrond Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: "pip"
directory: "/"
schedule:
interval: "monthly"
target-branch: "development"
3 changes: 1 addition & 2 deletions asterism/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
from django.contrib.postgres.fields import JSONField
from django.db import models


Expand Down Expand Up @@ -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)

Expand Down
10 changes: 5 additions & 5 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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)
2 changes: 1 addition & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ':'
Expand Down