Bump up version

GlobalNamesArchitecture · Dec 6, 2017 · 3bfc8d7 · 3bfc8d7
1 parent 17109ca
commit 3bfc8d7
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 28 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -73,7 +73,7 @@ jobs:
       - image: seansummers/jython
     working_directory: /root/gnparser
     environment:
-      GNPARSER_JAR_PATH: /root/gnparser/parser/target/scala-2.11/gnparser-assembly-0.4.2-SNAPSHOT.jar
+      GNPARSER_JAR_PATH: /root/gnparser/parser/target/scala-2.11/gnparser-assembly-0.4.3-SNAPSHOT.jar
     steps:
       - checkout
       - attach_workspace:
@@ -86,7 +86,7 @@ jobs:
       - image: cardcorp/r-java
     working_directory: /root/gnparser
     environment:
-      GNPARSER_JAR_PATH: /root/gnparser/parser/target/scala-2.11/gnparser-assembly-0.4.2-SNAPSHOT.jar
+      GNPARSER_JAR_PATH: /root/gnparser/parser/target/scala-2.11/gnparser-assembly-0.4.3-SNAPSHOT.jar
     steps:
       - checkout
       - attach_workspace:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,21 @@
+Version 0.4.3 (2017-12-06)
+--------------------------
+
+- Fix #396: don’t parse forbidden strings
+- Fix #403: fix viruses patterns
+- Fix #404: handle ‘le’ as author prefix
+- Fix #402: don’t parse name with ‘of’ word inside (#417)
+- Fix #248: handle sp. correctly (#419)
+- Fix #405: handle `ht` and `hort`
+- Fix #415: don’t parse `spec.` and `nov spec` (#424)
+- Fix #408: fix virus pattern (#423)
+- Fix #399: fix handling numbers in beginning of word
+- Fix #400: don’t parse epithets with ‘.’
+- Fix #401: add more ranks and two-letter abbreviations
+- Fix #426: cleanup redundant comparison
+- improve speed of Util object
+- bugs fixes (#380)
+
 Version 0.4.2 (2017-09-28)
 --------------------------
 

diff --git a/README.rst b/README.rst
@@ -9,7 +9,7 @@ Important Changes
 
 **The change as follows might break your code!** ``gnparser 0.4.1`` optionally returned
 ``canonical_name.value_extended`` in output JSON. **Only** if input name contains ranks,
-the field contains a canonical name with ranks. Otherwise the field is ``null``. ``gnparser 0.4.2``
+the field contains a canonical name with ranks. Otherwise the field is ``null``. ``gnparser 0.4.3``
 renames the field to ``canonical_name.value_ranked``. Also it always returns it, even if input name
 doesn't contain ranks.
 
@@ -31,10 +31,10 @@ Try it as a command line tool under Linux/Mac:
 
 .. code:: bash
 
-    wget https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.2/gnparser-0.4.2.zip
-    unzip gnparser-0.4.2.zip
+    wget https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.3/gnparser-0.4.3.zip
+    unzip gnparser-0.4.3.zip
     sudo rm -rf /opt/gnparser
-    sudo mv gnparser-0.4.2 /opt/gnparser
+    sudo mv gnparser-0.4.3 /opt/gnparser
     sudo rm -f /usr/local/bin/gnparser
     sudo ln -s /opt/gnparser/bin/gnparser /usr/local/bin
     gnparser name "Homo sapiens Linnaeus"
@@ -56,7 +56,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.2";console'
+    $ sbt ';set libraryDependencies += "org.globalnames" %% "gnparser" % "0.4.3";console'
     scala> import org.globalnames.parser.ScientificNameParser.{instance => scientificNameParser}
     scala> scientificNameParser.fromString("Homo sapiens Linnaeus").renderCompactJson
 
@@ -215,7 +215,7 @@ SBT:
 
 .. code:: Scala
 
-    libraryDependencies += "org.globalnames" %% "gnparser" % "0.4.2"
+    libraryDependencies += "org.globalnames" %% "gnparser" % "0.4.3"
 
 Maven:
 
@@ -224,20 +224,20 @@ Maven:
     <dependency>
         <groupId>org.globalnames</groupId>
         <artifactId>gnparser_2.11</artifactId>
-        <version>0.4.2</version>
+        <version>0.4.3</version>
     </dependency>
 
     <dependency>
         <groupId>org.globalnames</groupId>
         <artifactId>gnparser_2.10</artifactId>
-        <version>0.4.2</version>
+        <version>0.4.3</version>
     </dependency>
 
 Release Package
 ---------------
 
 `Release
-package <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.2>`_
+package <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.3>`_
 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>`_.
@@ -253,11 +253,11 @@ Released Files
 ===============================   ===============================================
 File                              Description
 ===============================   ===============================================
-``gnparser-assembly-0.4.2.jar``   `Fat Jar <#fat-jar>`_
-``gnparser-0.4.2.zip``            `Command line tool, web and socket
+``gnparser-assembly-0.4.3.jar``   `Fat Jar <#fat-jar>`_
+``gnparser-0.4.3.zip``            `Command line tool, web and socket
                                   server <#command-line-tool-and-socket-server>`_
-``release-0.4.2.zip``             Source code's zip file
-``release-0.4.2.tar.gz``          Source code's tar file
+``release-0.4.3.zip``             Source code's zip file
+``release-0.4.3.tar.gz``          Source code's tar file
 ===============================   ===============================================
 
 Fat Jar
@@ -268,9 +268,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.2/gnparser-assembly-0.4.2.jar>`_
+jar <https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.3/gnparser-assembly-0.4.3.jar>`_
 for ``gnparser`` can be found in the `current
-release <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.2>`_.
+release <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.3>`_.
 
 Command Line Tool and Socket Server
 -----------------------------------
@@ -280,18 +280,18 @@ Installation on Linux/Mac
 
 .. code:: bash
 
-    wget https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.2/gnparser-0.4.2.zip
-    unzip gnparser-0.4.2.zip
+    wget https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.3/gnparser-0.4.3.zip
+    unzip gnparser-0.4.3.zip
     sudo rm -rf /opt/gnparser
-    sudo mv gnparser-0.4.2 /opt/gnparser
+    sudo mv gnparser-0.4.3 /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.2.zip <https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.2/gnparser-0.4.2.zip>`_
+   `gnparser-0.4.3.zip <https://github.com/GlobalNamesArchitecture/gnparser/releases/download/release-0.4.3/gnparser-0.4.3.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
@@ -434,7 +434,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.2>`_
+`release <https://github.com/GlobalNamesArchitecture/gnparser/releases/tag/release-0.4.3>`_
 or `clone it from GitHub <#getting-code-for-development>`_
 
 Scala
@@ -488,7 +488,7 @@ To run it execute the command:
 
 .. code:: bash
 
-    GNPARSER_JAR_PATH=/path/to/gnparser-assembly-0.4.2.jar \
+    GNPARSER_JAR_PATH=/path/to/gnparser-assembly-0.4.3.jar \
       jython examples/jython/parser.py
 
 R
@@ -514,7 +514,7 @@ To run it execute the command:
 
 .. code:: bash
 
-    jruby -J-classpath /path/to/gnparser-assembly-0.4.2.jar \
+    jruby -J-classpath /path/to/gnparser-assembly-0.4.3.jar \
       examples/jruby/parser.rb
 
 Getting Code for Development

diff --git a/build.sbt b/build.sbt
@@ -5,7 +5,7 @@ val scalaV12 = "2.12.4"
 
 val commonSettings = Seq(
   version := {
-    val version = "0.4.2"
+    val version = "0.4.3"
     val release = sys.props.isDefinedAt("release")
     if (release) version
     else version + sys.props.get("buildNumber").map { "-" + _ }.getOrElse("") + "-SNAPSHOT"

diff --git a/examples/spark/README.rst b/examples/spark/README.rst
@@ -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.2.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.3.jar``
 
 Python
 ~~~~~~
@@ -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.2.jar" \
-      --driver-class-path="`pwd`/spark-python/target/scala-2.10/gnparser-spark-python-assembly-0.4.2.jar"`
+      --jars "`pwd`/spark-python/target/scala-2.10/gnparser-spark-python-assembly-0.4.3.jar" \
+      --driver-class-path="`pwd`/spark-python/target/scala-2.10/gnparser-spark-python-assembly-0.4.3.jar"`
 
 3. add Python snippet to call the wrapper: