Release 1.9.0

Author: jericks

.gitignore

@@ -16,4 +16,5 @@ site
 .idea/
 *.iml
 build/
-*.jython_cache
+*.jython_cache
+.DS_Store

doc/conf.py

@@ -45,9 +45,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.8'
+version = '1.9'
 # The full version, including alpha/beta/rc tags.
-release = '1.8.0'
+release = '1.9.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/download.rst

@@ -6,10 +6,10 @@ Downloads
 Stable
 ------
 
-The current stable release of GeoScript PY is 1.8.0. Select a file to download from below.
+The current stable release of GeoScript PY is 1.9.0. Select a file to download from below.
 
 .. cssclass:: external
 
-    * `tar.gz <https://github.com/geoscript/geoscript-py/releases/download/v1.8.0/geoscript-1.8.0.tar.gz>`_
+    * `tar.gz <https://github.com/geoscript/geoscript-py/releases/download/v1.9.0/geoscript-1.9.0.tar.gz>`_
 
-    * `zip <https://github.com/geoscript/geoscript-py/releases/download/v1.8.0/geoscript-1.8.0.zip>`_
+    * `zip <https://github.com/geoscript/geoscript-py/releases/download/v1.9.0/geoscript-1.9.0.zip>`_

geoscript/workspace/flatgeobuf.py

@@ -6,7 +6,7 @@
 from java import io, net
 from geoscript import util
 from geoscript.workspace import Workspace
-from org.geotools.data.flatgeobuf import FlatgeobufDataStoreFactory
+from org.geotools.data.flatgeobuf import FlatGeobufDataStoreFactory
 
 class FlatGeobuf(Workspace):
   """
@@ -17,8 +17,8 @@ class FlatGeobuf(Workspace):
 
   def __init__(self, dir=None):
     dir = dir or os.getcwd()
-    params = {'flatgeobuf-file': util.toFile(dir)}
-    Workspace.__init__(self, FlatgeobufDataStoreFactory(), params)
+    params = {'url': util.toURL(util.toFile(dir))}
+    Workspace.__init__(self, FlatGeobufDataStoreFactory(), params)
 
   def __repr__(self):
     return 'FlatGeobuf[%s]' % str(self._store.info.source.path)

pom.xml

@@ -4,7 +4,7 @@
     <groupId>org.geoscript</groupId>
     <artifactId>geoscript-py</artifactId>
     <packaging>jar</packaging>
-    <version>1.9-SNAPSHOT</version>
+    <version>1.9.0</version>
     <name>GeoScript Python</name>
     <repositories>
         <repository>
@@ -346,6 +346,6 @@
         </profile>
     </profiles>
     <properties>
-        <gt.version>26-SNAPSHOT</gt.version>
+        <gt.version>26.0</gt.version>
     </properties>
 </project>

scripts/install_jython.sh

@@ -1,5 +1,57 @@
+
+# Install Jython
+
 curl https://repo1.maven.org/maven2/org/python/jython-installer/2.7.2/jython-installer-2.7.2.jar -o target/jython-installer.jar
 
 java -jar target/jython-installer.jar -s -d target/jython
 
-target/jython/bin/jython -m pip install nose simplejson py-dom-xpath-redux
+# Pip for Jython is currently broken because of the lack of SNI support (https://github.com/jython/jython/issues/97)
+#target/jython/bin/jython -m pip install nose simplejson py-dom-xpath-redux
+
+# Install Nose
+
+curl https://files.pythonhosted.org/packages/58/a5/0dc93c3ec33f4e281849523a5a913fa1eea9a3068acfa754d44d88107a44/nose-1.3.7.tar.gz -o target/nose-1.3.7.tar.gz
+
+cd target
+
+tar -xf nose-1.3.7.tar.gz
+
+cd nose-1.3.7
+
+../jython/bin/jython setup.py install
+
+cd ..
+
+# Install simplejson
+
+curl -L https://github.com/simplejson/simplejson/archive/refs/tags/v3.17.5.tar.gz -o simplejson.tar.gz
+
+tar -xf simplejson.tar.gz
+
+cd simplejson-3.17.5
+
+../jython/bin/jython setup.py install
+
+cd ..
+
+# Install future
+
+curl -L https://files.pythonhosted.org/packages/45/0b/38b06fd9b92dc2b68d58b75f900e97884c45bedd2ff83203d933cf5851c9/future-0.18.2.tar.gz -o future-0.18.2.tar.gz
+
+tar -xf future-0.18.2.tar.gz
+
+cd future-0.18.2
+
+../jython/bin/jython setup.py install
+
+cd ..
+
+# Install py-dom-xpath-redux
+
+curl -L https://files.pythonhosted.org/packages/47/40/f7599dab3755179126e5f90db187b17e03090b242659ca8cfe8f6b3a54cf/py-dom-xpath-redux-0.1.1.tar.gz -o py-dom-xpath-redux-0.1.1.tar.gz
+
+tar -xf py-dom-xpath-redux-0.1.1.tar.gz
+
+cd py-dom-xpath-redux-0.1.1
+
+../jython/bin/jython setup.py install

setup.py

@@ -36,7 +36,7 @@ def run(self):
           self.distribution.dist_files.append(file)
 
 
-ver='1.8.0'
+ver='1.9.0'
 jars = ['jars/%s' % (f) for f in os.listdir('jars')]
 setup(cmdclass={'src': SrcCmd, 'doc': DocCmd}, 
       name='geoscript',