Skip to content

Commit

Permalink
Merge commit '5e62433b1dfb01cde916fee2bcb42660c4dbd231'
Browse files Browse the repository at this point in the history
* commit '5e62433b1dfb01cde916fee2bcb42660c4dbd231': (61 commits)
  Setting version to 0.8.0-RC4
  Publishing fixes.
  Fixes to compiled docs.
  Expose python expm1 function
  Update to release notes and developers list.
  Fix broken cell_types reference
  Add docs for new tile functions and clean up new names and signatures
  Register resample in Python API, update python tests
  Add simple NN resample function
  Add source file for rf_exp functions
  Add Exp inverse functions of Log
  Add round and log to python API
  Add is_no_data_tile to python API
  Add unary tile log functions
  Small tweaks.
  Add tile Log expressions
  Add expression support for UnaryLocalRasterOp and Round expression
  Reverted accidental commit of local build settings.
  Additional CatalystSerializer fixes.
  Fixes to address and detect differences in schemas between CatalystSerializer and ExpressionEncoder.
  ...

# Conflicts:
#	version.sbt
  • Loading branch information
metasim committed Mar 28, 2019
2 parents fdfc48b + 5e62433 commit 9ced1ec
Show file tree
Hide file tree
Showing 153 changed files with 8,538 additions and 2,354 deletions.
138 changes: 138 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
version: 2

_defaults: &defaults
working_directory: ~/repo
environment:
TERM: dumb
docker:
- image: circleci/openjdk:8-jdk

_setenv: &setenv
name: set CloudRepo credentials
command: |-
[ -d $HOME/.sbt ] || mkdir $HOME/.sbt
printf "realm=s22s.mycloudrepo.io\nhost=s22s.mycloudrepo.io\nuser=$CLOUDREPO_USER\npassword=$CLOUDREPO_PASSWORD\n" > $HOME/.sbt/.credentials
_delenv: &unsetenv
name: delete CloudRepo credential
command: rm -rf $HOME/.sbt/.credentials || true

_restore_cache: &restore_cache
keys:
- v2-dependencies-{{ checksum "build.sbt" }}
- v2-dependencies-

_save_cache: &save_cache
key: v2-dependencies--{{ checksum "build.sbt" }}
paths:
- ~/.ivy2/cache
- ~/.sbt
- ~/.rf_cache

jobs:
staticAnalysis:
<<: *defaults

steps:
- checkout
- run: *setenv
- restore_cache:
<<: *restore_cache

- run: cat /dev/null | sbt dependencyCheck
- run: cat /dev/null | sbt --debug dumpLicenseReport

- run: *unsetenv

- save_cache:
<<: *save_cache
- store_artifacts:
path: datasource/target/scala-2.11/dependency-check-report.html
destination: dependency-check-report-datasource.html
- store_artifacts:
path: experimental/target/scala-2.11/dependency-check-report.html
destination: dependency-check-report-experimental.html
- store_artifacts:
path: core/target/scala-2.11/dependency-check-report.html
destination: dependency-check-report-core.html
- store_artifacts:
path: pyrasterframes/target/scala-2.11/dependency-check-report.html
destination: dependency-check-report-pyrasterframes.html

test:
<<: *defaults
resource_class: large
steps:
- checkout
- run: *setenv
- restore_cache:
<<: *restore_cache

- run: sudo apt-get install python-pip pandoc && pip install setuptools # required for pyrasterframes testing
- run: cat /dev/null | sbt test

- run: *unsetenv
- save_cache:
<<: *save_cache

publish:
<<: *defaults
resource_class: large
steps:
- checkout
- run: *setenv
- restore_cache:
<<: *restore_cache

- run: sudo apt-get install python-pip pandoc && pip install setuptools # required for pyrasterframes testing
- run: cat /dev/null | sbt test
- run: cat /dev/null | sbt publish

- run: *unsetenv
- save_cache:
<<: *save_cache

it:
<<: *defaults
resource_class: xlarge
steps:
- checkout
- run: *setenv

- restore_cache:
<<: *restore_cache

- run:
command: cat /dev/null | sbt it:test
no_output_timeout: 30m
- run: *unsetenv

- save_cache:
<<: *save_cache

workflows:
version: 2
all:
jobs:
- test
- it:
filters:
branches:
only:
- /astraea\/feature\/.*-its/
- publish:
filters:
branches:
only:
- astraea/develop
nightlyReleaseAstraea:
triggers:
- schedule:
cron: "0 8 * * *"
filters:
branches:
only:
- astraea/develop
jobs:
- it
- staticAnalysis
4 changes: 3 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
maxColumn = 100
maxColumn = 138
continuationIndent.defnSite = 2
continuationIndent.callSite = 2
continuationIndent.extendSite = 2
binPack.parentConstructors = true
binPack.literalArgumentLists = false
binPack.unsafeCallSite = true
Expand Down
17 changes: 12 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ language: scala
cache:
directories:
- $HOME/.ivy2/cache
- $HOME/.sbt/boot/
- $HOME/.sbt/boot
- $HOME/.rf_cache

scala:
- 2.11.11
Expand All @@ -14,17 +15,23 @@ jdk:
- oraclejdk8

addons:
apt_packages:
- pandoc
apt:
packages:
- pandoc
- python-pip

install:
- pip install setuptools

sbt_args: -no-colors

script:
- sbt -Dfile.encoding=UTF8 clean core/test datasource/test
- sbt test
- sbt it:test
# - sbt -Dfile.encoding=UTF8 clean coverage test coverageReport
# Tricks to avoid unnecessary cache updates
- find $HOME/.sbt -name "*.lock" | xargs rm
- find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm

#after_success:
# - bash <(curl -s https://codecov.io/bash)
# - bash <(curl -s https://codecov.io/bash)
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<img src="docs/src/main/paradox/_template/images/RasterFramesLogo.png" width="300px"/><sup style="vertical-align: top;">&trade;</sup>

[![Build Status](https://travis-ci.org/locationtech/rasterframes.svg?branch=master)](https://travis-ci.org/s22s/raster-frames)
[![Join the chat at https://gitter.im/s22s/raster-frames](https://badges.gitter.im/s22s/raster-frames.svg)](https://gitter.im/s22s/raster-frames?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

_RasterFrames™_ brings the power of Spark DataFrames to geospatial raster data, empowered by the map algebra and tile layer operations of [GeoTrellis](https://geotrellis.io/).
Expand Down
Loading

0 comments on commit 9ced1ec

Please sign in to comment.