Skip to content
This repository has been archived by the owner on Jun 17, 2023. It is now read-only.

Commit

Permalink
Bump up gnparser version
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-myltsev committed Sep 28, 2017
1 parent 7f12908 commit 0bde416
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 24 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
Version 0.4.2 (2017-09-28)
--------------------------

- provide `EmptyUuid` for empty string in GN namespace
- support `emend` in name (#382)
- correctly parse `str.` for `strain` (#384)
- parse `-x` in species names (#385)
- names with `not` in uninomial/genus are not parsed (#379)
- restrict abbreviated genera to 2 letters (#245)
- minor optimisations, bug fixes (#380)

Version 0.4.1 (2017-06-31)
--------------------------

Expand Down
42 changes: 21 additions & 21 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ Try it as a command line tool under Linux/Mac:

.. code:: bash
wget https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.1/gnparser-0.4.1.zip
unzip gnparser-0.4.1.zip
wget https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.2/gnparser-0.4.2.zip
unzip gnparser-0.4.2.zip
sudo rm -rf /opt/gnparser
sudo mv gnparser-0.4.1 /opt/gnparser
sudo mv gnparser-0.4.2 /opt/gnparser
sudo rm -f /usr/local/bin/gnparser
sudo ln -s /opt/gnparser/bin/gnparser /usr/local/bin
gnparser name "Homo sapiens Linnaeus"
Expand All @@ -52,7 +52,7 @@ Finally, run it right from your SBT console:
$ mkdir -p project
$ echo 'sbt.version=0.13.12' > project/build.properties
$ sbt ';set libraryDependencies += "org.globalnames" %% "gnparser" % "0.4.1";console'
$ sbt ';set libraryDependencies += "org.globalnames" %% "gnparser" % "0.4.2";console'
scala> import org.globalnames.parser.ScientificNameParser.{instance => scientificNameParser}
scala> scientificNameParser.fromString("Homo sapiens Linnaeus").renderCompactJson
Expand Down Expand Up @@ -211,7 +211,7 @@ SBT:

.. code:: Scala
libraryDependencies += "org.globalnames" %% "gnparser" % "0.4.1"
libraryDependencies += "org.globalnames" %% "gnparser" % "0.4.2"
Maven:

Expand All @@ -220,20 +220,20 @@ Maven:
<dependency>
<groupId>org.globalnames</groupId>
<artifactId>gnparser_2.11</artifactId>
<version>0.4.1</version>
<version>0.4.2</version>
</dependency>
<dependency>
<groupId>org.globalnames</groupId>
<artifactId>gnparser_2.10</artifactId>
<version>0.4.1</version>
<version>0.4.2</version>
</dependency>
Release Package
---------------

`Release
package <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.1>`_
package <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.2>`_
should be sufficient for all usages but development. It is not needed
for including ``gnparser`` into Java or Scala code -- `declare dependency
instead <#dependency-declaration-for-java-or-scala>`_.
Expand All @@ -249,11 +249,11 @@ Released Files
=============================== ===============================================
File Description
=============================== ===============================================
``gnparser-assembly-0.4.1.jar`` `Fat Jar <#fat-jar>`_
``gnparser-0.4.1.zip`` `Command line tool, web and socket
``gnparser-assembly-0.4.2.jar`` `Fat Jar <#fat-jar>`_
``gnparser-0.4.2.zip`` `Command line tool, web and socket
server <#command-line-tool-and-socket-server>`_
``release-0.4.1.zip`` Source code's zip file
``release-0.4.1.tar.gz`` Source code's tar file
``release-0.4.2.zip`` Source code's zip file
``release-0.4.2.tar.gz`` Source code's tar file
=============================== ===============================================

Fat Jar
Expand All @@ -264,9 +264,9 @@ necessary to run a program. Such a jar would include Scala and all
required libraries.

`Fat
jar <https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.1/gnparser-assembly-0.4.1.jar>`_
jar <https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.2/gnparser-assembly-0.4.2.jar>`_
for ``gnparser`` can be found in the `current
release <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.1>`_.
release <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.2>`_.

Command Line Tool and Socket Server
-----------------------------------
Expand All @@ -276,18 +276,18 @@ Installation on Linux/Mac

.. code:: bash
wget https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.1/gnparser-0.4.1.zip
unzip gnparser-0.4.1.zip
wget https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.2/gnparser-0.4.2.zip
unzip gnparser-0.4.2.zip
sudo rm -rf /opt/gnparser
sudo mv gnparser-0.4.1 /opt/gnparser
sudo mv gnparser-0.4.2 /opt/gnparser
sudo rm -f /usr/local/bin/gnparser
sudo ln -s /opt/gnparser/bin/gnparser /usr/local/bin
Installation on Windows
~~~~~~~~~~~~~~~~~~~~~~~

1. Download
`gnparser-0.4.1.zip <https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.1/gnparser-0.4.1.zip>`_
`gnparser-0.4.2.zip <https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.2/gnparser-0.4.2.zip>`_
2. Extract it to a place where you usually store program files
3. Update your `PATH <https://java.com/en/download/help/path.xml>`_ to
point to bin subdirectory
Expand Down Expand Up @@ -430,7 +430,7 @@ To avoid declaring multiple dependencies Jython, JRuby and R need a
`reference gnparser fat-jar <#fat-jar>`_.

If you decide to follow examples get the code from the
`release <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.1>`_
`release <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.2>`_
or `clone it from GitHub <#getting-code-for-development>`_

Scala
Expand Down Expand Up @@ -484,7 +484,7 @@ To run it execute the command:

.. code:: bash
GNPARSER_JAR_PATH=/path/to/gnparser-assembly-0.4.1.jar \
GNPARSER_JAR_PATH=/path/to/gnparser-assembly-0.4.2.jar \
jython examples/jython/parser.py
R
Expand All @@ -510,7 +510,7 @@ To run it execute the command:

.. code:: bash
jruby -J-classpath /path/to/gnparser-assembly-0.4.1.jar \
jruby -J-classpath /path/to/gnparser-assembly-0.4.2.jar \
examples/jruby/parser.rb
Getting Code for Development
Expand Down
6 changes: 3 additions & 3 deletions examples/spark/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ is an SBT subproject. To run it complete steps as follows:

1. build a fat-jar of the example with ``sbt ";++2.10.6;exampleSpark/assembly"``

2. run it with Spark by executing ``$SPARK_HOME/bin/spark-submit ./examples/spark/target/scala-2.10/gnparser-example-spark-assembly-0.4.1.jar``
2. run it with Spark by executing ``$SPARK_HOME/bin/spark-submit ./examples/spark/target/scala-2.10/gnparser-example-spark-assembly-0.4.2.jar``

Python
~~~~~~
Expand All @@ -25,8 +25,8 @@ Python
.. code:: bash
$SPARK_HOME/bin/pyspark \
--jars "`pwd`/spark-python/target/scala-2.10/gnparser-spark-python-assembly-0.4.1.jar" \
--driver-class-path="`pwd`/spark-python/target/scala-2.10/gnparser-spark-python-assembly-0.4.1.jar"`
--jars "`pwd`/spark-python/target/scala-2.10/gnparser-spark-python-assembly-0.4.2.jar" \
--driver-class-path="`pwd`/spark-python/target/scala-2.10/gnparser-spark-python-assembly-0.4.2.jar"`
3. add Python snippet to call the wrapper:
Expand Down

0 comments on commit 0bde416

Please sign in to comment.