Skip to content

Commit

Permalink
Merge pull request #2445 from intermine/dev
Browse files Browse the repository at this point in the history
Release 5.1.0
  • Loading branch information
Daniela Butano committed Aug 26, 2022
2 parents cc5b746 + fdf3df8 commit b5f10bd
Show file tree
Hide file tree
Showing 82 changed files with 2,271 additions and 400 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -3,7 +3,7 @@ InterMine

Master: [![InterMine CI](https://github.com/intermine/intermine/workflows/InterMine%20CI/badge.svg?branch=master)](https://github.com/intermine/intermine/actions?query=workflow%3A%22InterMine+CI%22)
Dev: [![InterMine CI](https://github.com/intermine/intermine/workflows/InterMine%20CI/badge.svg?branch=dev)](https://github.com/intermine/intermine/actions?query=workflow%3A%22InterMine+CI%22)
[![Version](http://img.shields.io/badge/version-5.0.8-blue.svg?style=flat)](https://github.com/intermine/intermine/releases)
[![Version](http://img.shields.io/badge/version-5.1.0-blue.svg?style=flat)](https://github.com/intermine/intermine/releases)
[![License](http://img.shields.io/badge/license-LGPL_2.1-blue.svg?style=flat)](https://github.com/intermine/intermine/blob/master/LICENSE)
[![Research software impact](http://depsy.org/api/package/pypi/intermine/badge.svg)](http://depsy.org/package/python/intermine)
[![Conda](https://anaconda.org/anaconda/conda-build/badges/installer/conda.svg)](https://anaconda.org/bioconda/intermine)
Expand Down
15 changes: 15 additions & 0 deletions RELEASE_NOTES
Expand Up @@ -7,6 +7,21 @@
* information or http://www.gnu.org/copyleft/lesser.html.
*
*/
InterMine 5.1.0 (August 2022)

#2025 - FAIR: PURLs come from config file
#2183 - Improve external links using Identifiers.org
#2287 - Export query result in RDF format
#2365 - Setting a property to postprocess in project.xml does not work
#2366 - Generating intermine R2RML mapping
#2378 - Update SolrKeywordSearchHandler (thanks @sammyjava)
#2379 - RDF representation for single entity
#2381 - Add a new webservice to allow BG to RDF representation
#2382 - Add reccomended properties to Gene and Protein Bioschemas profiles
#2389 - Improve term assigned to the intermine entity
#2390 - Apply ontology terms to the attributes too
#2391 - Missing term applied to the additions file after merging

InterMine 5.0.8 (June 2022)

- Improved user input checks
Expand Down
2 changes: 1 addition & 1 deletion bio/build.gradle
@@ -1,6 +1,6 @@
subprojects {
group = 'org.intermine'
version = '5.0.8'
version '5.1.0'

apply plugin: "java"
apply plugin: "maven"
Expand Down
Expand Up @@ -831,11 +831,11 @@ private ClassDescriptor processRefsAndColls(String parents, String childIdentifi
if (isManyToMany(parent, childIdentifier)) {
parentName = parentName + "s";
CollectionDescriptor cd = new CollectionDescriptor(parentName,
fullyQualifiedClassName, reverseReference);
fullyQualifiedClassName, reverseReference, null);
collections.add(cd);
} else {
ReferenceDescriptor rd = new ReferenceDescriptor(parentName,
fullyQualifiedClassName, reverseReference);
fullyQualifiedClassName, reverseReference, null);
references.add(rd);
}
}
Expand All @@ -858,7 +858,7 @@ private ClassDescriptor processRefsAndColls(String parents, String childIdentifi
isManyToMany(collection, childIdentifier));
// cd
CollectionDescriptor cd = new CollectionDescriptor(collectionName ,
fullyQualifiedClassName, reverseReference);
fullyQualifiedClassName, reverseReference, null);
collections.add(cd);
}
}
Expand Down
4 changes: 2 additions & 2 deletions bio/gradle.properties
@@ -1,5 +1,5 @@
systemProp.imVersion=5.0.8
systemProp.bioVersion=5.0.8
systemProp.imVersion=5.1.0
systemProp.bioVersion=5.1.0

# some unit tests need additional classes that aren't in the core model.
# we use flymine's model. don't touch!
Expand Down
Binary file modified bio/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion bio/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
148 changes: 74 additions & 74 deletions bio/model/core.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bio/model/genomic_additions.xml
Expand Up @@ -34,7 +34,7 @@
<collection name="genes" referenced-type="Gene" reverse-reference="introns"/>
</class>

<class name="Protein" is-interface="true" term="http://semanticscience.org/resource/SIO_010043">
<class name="Protein" is-interface="true" term="http://purl.uniprot.org/core/Protein,http://semanticscience.org/resource/SIO_010043">
<collection name="CDSs" referenced-type="CDS" reverse-reference="protein"/>
<collection name="transcripts" referenced-type="Transcript" reverse-reference="protein"/>
</class>
Expand Down
2 changes: 1 addition & 1 deletion bio/postprocess-test/build.gradle
Expand Up @@ -17,7 +17,7 @@ ext {

subprojects {
group = 'org.intermine'
version = '5.0.8'
version '5.1.0'

apply plugin: 'java'
apply plugin: 'maven'
Expand Down
4 changes: 2 additions & 2 deletions bio/postprocess-test/gradle.properties
@@ -1,5 +1,5 @@
systemProp.imVersion=5.0.8
systemProp.bioVersion=5.0.8
systemProp.imVersion=5.1.0
systemProp.bioVersion=5.1.0

systemProp.flymineVersion=4.2.0

Expand Down
2 changes: 1 addition & 1 deletion bio/postprocess/build.gradle
Expand Up @@ -16,7 +16,7 @@ ext {

subprojects {
group = 'org.intermine'
version = '5.0.8'
version '5.1.0'

apply plugin: 'java'
apply plugin: 'maven'
Expand Down
27 changes: 27 additions & 0 deletions bio/postprocess/create-R2RML-mapping/build.gradle
@@ -0,0 +1,27 @@
sourceSets {
main {
java {
srcDirs = ['src/main/java']
}
resources {
srcDirs = ['src/main/resources']
}
}
}

repositories {
mavenCentral()
}

dependencies {
bioModel group: 'org.intermine', name: 'bio-model', version: bioVersion, transitive: false
compile group: "org.intermine", name: "intermine-model", version: imVersion
compile group: "org.intermine", name: "intermine-objectstore", version: imVersion
compile group: "org.intermine", name: "intermine-api", version: imVersion
compile group: "org.apache.jena", name: "apache-jena-libs", version: "3.16.0"
}

processResources {
from('.') { include ("*.properties")}
}

@@ -0,0 +1 @@
postprocessor.class=org.intermine.bio.postprocess.R2RMLMappingProcess
@@ -0,0 +1,142 @@
package org.intermine.bio.postprocess;

/*
* Copyright (C) 2002-2021 FlyMine
* Copyright (C) 2020 SIB Swiss Institute of Bioinformatics
*
* This code may be freely distributed and modified under the
* terms of the GNU Lesser General Public Licence. This should
* be distributed with the code. See the LICENSE file for more
* information or http://www.gnu.org/copyleft/lesser.html.
*
*/
import org.apache.jena.rdf.model.Property;
import org.apache.jena.rdf.model.RDFNode;
import org.apache.jena.rdf.model.Resource;
import org.apache.jena.rdf.model.ResourceFactory;

/**
* Class facilitating the creation of R2RML properties
* @author Jerven Bolleman
* @author Daniela Butano
*/
public final class R2RML
{
private R2RML() {
// Hidden constructor.
}

/**
* R2RML namespace
*/
public static final String URI = "http://www.w3.org/ns/r2rml#";

/**
* Create TriplesMap property
*/
public static final Resource TRIPLE_MAP = ResourceFactory.createProperty(URI, "TriplesMap");

/**
* Create logicalTable property
*/
public static final Property LOGICAL_TABLE = ResourceFactory.createProperty(URI,
"logicalTable");

/**
* Create tableName property
*/
public static final Property TABLE_NAME = ResourceFactory.createProperty(URI, "tableName");

/**
* Create subjectMap property
*/
public static final Property SUBJECT_MAP = ResourceFactory.createProperty(URI, "subjectMap");

/**
* Create template property
*/
public static final Property TEMPLATE = ResourceFactory.createProperty(URI, "template");

/**
* Create class property
*/
public static final Property CLASS_PROPERTY = ResourceFactory.createProperty(URI, "class");

/**
* Create objectMap property
*/
public static final Property OBJECT_MAP = ResourceFactory.createProperty(URI, "objectMap");

/**
* Create TermMap property
*/
public static final RDFNode TERM_MAP = ResourceFactory.createProperty(URI, "TermMap");

/**
* Create Literal property
*/
public static final RDFNode LITERAL = ResourceFactory.createProperty(URI, "Literal");

/**
* Create termType property
*/
public static final Property TERM_TYPE = ResourceFactory.createProperty(URI, "termType");

/**
* Create datatype property
*/
public static final Property DATA_TYPE = ResourceFactory.createProperty(URI, "datatype");

/**
* Create property
*/
public static final Property COLUMN = ResourceFactory.createProperty(URI, "column");

/**
* Create column property
*/
public static final Property PREDICATE = ResourceFactory.createProperty(URI, "predicate");

/**
* Create predicate property
*/
public static final Property PARENT_TRIPLE_MAP = ResourceFactory.createProperty(URI,
"parentTriplesMap");

/**
* Create joinCondition property
*/
public static final Property JOIN_CONDITION = ResourceFactory.createProperty(URI,
"joinCondition");

/**
* Create child property
*/
public static final Property CHILD = ResourceFactory.createProperty(URI, "child");

/**
* Create parent property
*/
public static final Property PARENT = ResourceFactory.createProperty(URI, "parent");

/**
* Create R2RMLView property
*/
public static final Property R2RML_VIEW = ResourceFactory.createProperty(URI, "R2RMLView");

/**
* Create property
*/
public static final Property SQL_QUERY = ResourceFactory.createProperty(URI, "sqlQuery");

/**
* Create sqlQuery property
*/
public static final Property PREDICATE_OBJECT_MAP = ResourceFactory.createProperty(URI,
"predicateObjectMap");

/**
* Create IRI property
*/
public static final RDFNode IRI = ResourceFactory.createProperty(URI, "IRI");
}

0 comments on commit b5f10bd

Please sign in to comment.