Skip to content

Commit

Permalink
Add build scripts and fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jericks committed May 16, 2020
1 parent c56f711 commit 9641b18
Show file tree
Hide file tree
Showing 9 changed files with 26 additions and 5 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ dist
*.swp
env
tests/dbexts.ini
scripts
site
.idea/
*.iml
Expand Down
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
dist: trusty

language: java

jdk:
- oraclejdk8
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
#html_theme_options = {}

# Add any paths that contain custom themes here, relative to this directory.
html_theme_path = ['../../site/source/_theme', '../../../source/_theme']
html_theme_path = ['../../geoscript.net/source/_theme', '../../../source/_theme']

# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
Expand Down
1 change: 0 additions & 1 deletion geoscript/layer/io/json.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ def writeJSON(obj, output=sys.stdout):
>>>
>>> out = file(os.devnull, 'w')
>>> writeJSON(l, output=out)
>>> writeJSON(l.cursor('INTERSECTS(geom, POINT (1 2))'), output=out)
"""

fcol = obj._fcol if isinstance(obj,Cursor) else obj._source.getFeatures()
Expand Down
4 changes: 2 additions & 2 deletions geoscript/layer/layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ def bounds(self, filter=None):
>>> l.add([geom.Point(3.0, 4.0)])
>>> l.bounds()
(1.0, 2.0, 3.0, 4.0, EPSG:4326)
(1.0, 2.0, 3.0, 4.0)
>>> l.bounds('INTERSECTS(geom,POINT(3 4))')
(3.0, 4.0, 3.0, 4.0, EPSG:4326)
(3.0, 4.0, 3.0, 4.0)
"""

f = Filter(filter) if filter else Filter.PASS
Expand Down
5 changes: 5 additions & 0 deletions scripts/install_jython.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
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
2 changes: 2 additions & 0 deletions scripts/package.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
target/jython/bin/jython setup.py sdist src doc
target/jython/bin/jython setup.py sdist --format=zip
5 changes: 5 additions & 0 deletions scripts/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source classpath

cd tests

../target/jython/bin/jython run.py
5 changes: 5 additions & 0 deletions scripts/test_headless.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
source classpath

cd tests

../target/jython/bin/jython -Djava.awt.headless=true run.py

0 comments on commit 9641b18

Please sign in to comment.