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

Fix mime order #1829

Merged
merged 4 commits into from
Jul 28, 2023
Merged

Fix mime order #1829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0557705
Fix for MIME type ordering in renderers.
dmichaels-harvard Jul 27, 2023
10172c1
poetry update dcicsnovault
dmichaels-harvard Jul 27, 2023
b49fb34
Update dcicsnovault to 9.0.0.1b2
dmichaels-harvard Jul 27, 2023
ca8d569
lock real version, debeta
willronchetti Jul 28, 2023
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
6 changes: 5 additions & 1 deletion CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,12 @@ fourfront
Change Log
----------

6.1.0
=====
* Fix for MIME type ordering in renderers.py (differs between cgap and fourfront).

6.0.1
======
=====

`GA4 post-migration updates <https://github.com/4dn-dcic/fourfront/pull/1825>`_

Expand Down
8 changes: 4 additions & 4 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tool.poetry]
# Note: Various modules refer to this system as "encoded", not "fourfront".
name = "encoded"
version = "6.0.1"
version = "6.1.0"
description = "4DN-DCIC Fourfront"
authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
license = "MIT"
Expand Down Expand Up @@ -47,7 +47,7 @@ colorama = "0.3.3"
# we get odd 'pyo3_runtime.PanicException: Python API call failed' error on import
# of cryptography.hazmat.bindings._rust in cryptography package. 2023-04-21.
cryptography = "39.0.2"
dcicsnovault = "9.0.0"
dcicsnovault = "^9.1.0"
dcicutils = "^7.5.0"
elasticsearch = "7.13.4"
elasticsearch-dsl = "^7.0.0" # TODO: port code from cgap-portal to get rid of uses
Expand Down
7 changes: 7 additions & 0 deletions src/encoded/project/renderers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
from snovault.project.renderers import SnovaultProjectRenderers
from snovault.mime_types import MIME_TYPE_HTML, MIME_TYPE_JSON, MIME_TYPE_LD_JSON

class FourfrontProjectRenderers(SnovaultProjectRenderers):

def renderers_mime_types_supported(self):
return [MIME_TYPE_HTML, MIME_TYPE_JSON, MIME_TYPE_LD_JSON]
2 changes: 2 additions & 0 deletions src/encoded/project_defs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
from .project.authorization import FourfrontProjectAuthorization
from .project.ingestion import FourfrontProjectIngestion
from .project.loadxl import FourfrontProjectLoadxl
from .project.renderers import FourfrontProjectRenderers

@C4ProjectRegistry.register(APPLICATION_PYPROJECT_NAME)
class FourfrontProject(FourfrontProjectAccessKey,
FourfrontProjectAuthentication,
FourfrontProjectAuthorization,
FourfrontProjectIngestion,
FourfrontProjectLoadxl,
FourfrontProjectRenderers,
SnovaultProject):
NAMES = {'NAME': APPLICATION_NAME, 'PYPI_NAME': APPLICATION_PYPROJECT_NAME}
ACCESSION_PREFIX = "4DN"
Expand Down
Loading