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.

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

Bump version 1 5 2 #4063

Merged
merged 2 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Janeway is a web-based platform for publishing journals, preprints, conference proceedings, and books. It is developed and maintained by a team of developers at the Open Library of Humanities, part of Birkbeck, University of London.

# Technology
Janeway is written in Python (3.6+) and utilises the Django framework (3.2).
Janeway is written in Python (3.9+) and utilises the Django framework (3.2).


# Installation instructions
Expand Down
1 change: 0 additions & 1 deletion dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
django_nose
coverage
ipdb
python-wordpress-xmlrpc
Expand Down
2 changes: 0 additions & 2 deletions src/core/dev_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
)
INSTALLED_APPS = [
'debug_toolbar',
'django_nose',
]


Expand All @@ -33,7 +32,6 @@ def show_toolbar(request):
DEBUG_TOOLBAR_CONFIG = {
"SHOW_TOOLBAR_CALLBACK": show_toolbar,
}
TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'

HIJACK_LOGIN_REDIRECT_URL = '/manager/'
HIJACK_USERS_ENABLED = True
Expand Down
8 changes: 2 additions & 6 deletions src/core/templatetags/debug_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,8 @@ class TraceNode(template.Node):
"""

def render(self, context):
try:
from nose import tools
tools.set_trace() # Debugger will stop here
except (ModuleNotFoundError, ImportError):
import pdb
pdb.set_trace() # Debugger will stop here
import pdb
pdb.set_trace()
return ''


Expand Down
2 changes: 1 addition & 1 deletion src/janeway/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
from packaging import version
__version__ = version.parse("1.5.1-RC-6")
__version__ = version.parse("1.5.2-RC-1")
29 changes: 29 additions & 0 deletions src/utils/migrations/0032_upgrade_1_5_2.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# -*- coding: utf-8 -*-

from django.db import migrations, models
from django.utils import timezone

VERSION = "1.5.2"


def rollback(apps, schema_editor):
version_model = apps.get_model("utils", "Version")
latest_version = version_model.objects.get(number=VERSION, rollback=None)
latest_version.rollback = timezone.now()
latest_version.save()

def upgrade(apps, schema_editor):
version_model = apps.get_model("utils", "Version")
new_version = version_model.objects.create(number=VERSION)
new_version.save()

class Migration(migrations.Migration):

dependencies = [
('utils', '0031_upgrade_1_5_1'),
('core', '0087_merge_20240315_1649'),
]

operations = [
migrations.RunPython(upgrade, reverse_code=rollback),
]