Skip to content

Commit

Permalink
Merge pull request #394 from akmorrow13/maint_spark2_2.11-0.0.1
Browse files Browse the repository at this point in the history
Maint spark2 2.11 0.0.1
  • Loading branch information
akmorrow13 authored Apr 12, 2018
2 parents 68f54c4 + 7a2c347 commit 3d75a19
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 18 deletions.
4 changes: 2 additions & 2 deletions mango-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.bdgenomics.mango</groupId>
<artifactId>mango-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down Expand Up @@ -70,7 +70,7 @@
</relocation>
</relocations>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
</configuration>
</execution>
Expand Down
5 changes: 2 additions & 3 deletions mango-cli/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.bdgenomics.mango</groupId>
<artifactId>mango-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mango-cli</artifactId>
Expand Down
5 changes: 2 additions & 3 deletions mango-core/pom.xml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.bdgenomics.mango</groupId>
<artifactId>mango-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>mango-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion mango-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.bdgenomics.mango</groupId>
<artifactId>mango-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion mango-python/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.bdgenomics.mango</groupId>
<artifactId>mango-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
7 changes: 7 additions & 0 deletions mango-python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
from setuptools import find_packages, setup
from version import version as mango_version
from pip.req import parse_requirements
import os

# Utility function to read the README file.
# Used for the long_description.
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()

# parse_requirements() returns generator of pip.req.InstallRequirement objects
install_reqs = parse_requirements('requirements.txt', session='hack')
Expand All @@ -36,4 +42,5 @@
dependency_links=[
'https://test.pypi.org/simple/bdgenomics-adam/'
],
long_description=read('README.md'),
packages=find_packages(exclude=['*.test.*']))
2 changes: 1 addition & 1 deletion mango-python/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#
from __future__ import print_function

version = '0.0.1a2'
version = '0.0.2a0'

if __name__ == '__main__':
print(version)
2 changes: 1 addition & 1 deletion mango-viz/bdgenomics/mango/pileup/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# limitations under the License.
#

version_info = (0, 0, '1a1')
version_info = (0, 0, '2a0')
__version__ = '.'.join(map(str, version_info))
2 changes: 1 addition & 1 deletion mango-viz/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.bdgenomics.mango</groupId>
<artifactId>mango-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 7 additions & 1 deletion mango-viz/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@
log.info('setup.py entered')
log.info('$PATH=%s' % os.environ['PATH'])

LONG_DESCRIPTION = 'bdgenomics.mango.pileup'
# Utility function to read the README file.
# Used for the long_description.
def read(fname):
return open(os.path.join(os.path.dirname(__file__), fname)).read()


LONG_DESCRIPTION = read("README.md")

def js_prerelease(command, strict=False):
"""decorator for building minified js/css prior to another command"""
Expand Down
7 changes: 3 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
<relativePath/>
<relativePath />
</parent>

<modelVersion>4.0.0</modelVersion>
<groupId>org.bdgenomics.mango</groupId>
<artifactId>mango-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
<version>0.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<name>mango</name>

Expand Down

0 comments on commit 3d75a19

Please sign in to comment.