Skip to content

Commit

Permalink
Merge branch 'release/0.3.8' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Aug 29, 2023
2 parents 5b8fb45 + 19e4244 commit b22a532
Show file tree
Hide file tree
Showing 6 changed files with 56 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.10', '3.11']
django-version: ['4.1', 'dev']
python-version: ['3.11']
django-version: ['4.2', 'dev']

services:
mysql:
Expand Down
10 changes: 6 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ repos:
- "-x *test*.py"

- repo: https://github.com/psf/black
rev: 23.3.0
rev: 23.7.0
hooks:
- id: black
language_version: python3.10
language_version: python3.11

- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 6.1.0
hooks:
- id: flake8
args:
Expand All @@ -40,9 +40,11 @@ repos:
- id: check-merge-conflict
- id: debug-statements
- id: detect-private-key
- id: detect-aws-credentials
- id: check-toml

- repo: https://github.com/adrienverge/yamllint
rev: v1.31.0
rev: v1.32.0
hooks:
- id: yamllint
args:
Expand Down
4 changes: 0 additions & 4 deletions django_crypto_fields/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ def __init__(self, app_label: str, model_name: str):
"the project, set settings.AUTO_CREATE_KEYS=True and restart. "
"Make sure the folder is writeable."
)

sys.stdout.write(
style.WARNING(f" * settings.AUTO_CREATE_KEYS={self.auto_create_keys}.\n")
)
else:
self._keys = Keys(key_path=self.key_path)
self._keys.load_keys()
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Generated by Django 4.2.4 on 2023-08-23 01:13

import _socket
from django.db import migrations, models
import django_audit_fields.fields.hostname_modification_field


class Migration(migrations.Migration):
dependencies = [
("django_crypto_fields", "0003_alter_crypt_cipher_mode"),
]

operations = [
migrations.AlterField(
model_name="crypt",
name="device_created",
field=models.CharField(blank=True, max_length=10, verbose_name="Device created"),
),
migrations.AlterField(
model_name="crypt",
name="device_modified",
field=models.CharField(blank=True, max_length=10, verbose_name="Device modified"),
),
migrations.AlterField(
model_name="crypt",
name="hostname_created",
field=models.CharField(
blank=True,
default=_socket.gethostname,
help_text="System field. (modified on create only)",
max_length=60,
verbose_name="Hostname created",
),
),
migrations.AlterField(
model_name="crypt",
name="hostname_modified",
field=django_audit_fields.fields.hostname_modification_field.HostnameModificationField(
blank=True,
help_text="System field. (modified on every save)",
max_length=50,
verbose_name="Hostname modified",
),
),
]
4 changes: 0 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,20 +36,17 @@ exclude_lines = [
legacy_tox_ini = """
[tox]
envlist =
py{310}-dj{41,42},
py{311}-dj{41,42,dev},
lint
isolated_build = true
[gh-actions]
python =
3.10: py310
3.11: py311, lint
[gh-actions:env]
DJANGO =
4.1: dj41
4.2: dj42, lint
dev: djdev
Expand All @@ -59,7 +56,6 @@ deps =
-r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/test_utils.txt
-r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/edc.txt
-r https://raw.githubusercontent.com/clinicedc/edc/develop/requirements.tests/third_party_dev.txt
dj41: Django>=4.1,<4.2
dj42: Django>=4.2,<5.0
djdev: https://github.com/django/django/tarball/main
Expand Down
7 changes: 3 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,17 @@ keywords = django Edc fields encryption security
classifiers=
Environment :: Web Environment
Framework :: Django
Framework :: Django :: 4.0
Framework :: Django :: 4.1
Framework :: Django :: 4.2
Intended Audience :: Developers
Intended Audience :: Science/Research
Operating System :: OS Independent
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.12
License :: OSI Approved :: GNU General Public License v3 (GPLv3)


[options]
python_requires = >=3.10
python_requires = >=3.11
zip_safe = False
include_package_data = True
packages = find:
Expand Down

0 comments on commit b22a532

Please sign in to comment.