Skip to content

Commit 9ced1ec

Browse files
committed
Merge commit '5e62433b1dfb01cde916fee2bcb42660c4dbd231'
* 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
2 parents fdfc48b + 5e62433 commit 9ced1ec

File tree

153 files changed

+8538
-2354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

153 files changed

+8538
-2354
lines changed

.circleci/config.yml

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
version: 2
2+
3+
_defaults: &defaults
4+
working_directory: ~/repo
5+
environment:
6+
TERM: dumb
7+
docker:
8+
- image: circleci/openjdk:8-jdk
9+
10+
_setenv: &setenv
11+
name: set CloudRepo credentials
12+
command: |-
13+
[ -d $HOME/.sbt ] || mkdir $HOME/.sbt
14+
printf "realm=s22s.mycloudrepo.io\nhost=s22s.mycloudrepo.io\nuser=$CLOUDREPO_USER\npassword=$CLOUDREPO_PASSWORD\n" > $HOME/.sbt/.credentials
15+
16+
_delenv: &unsetenv
17+
name: delete CloudRepo credential
18+
command: rm -rf $HOME/.sbt/.credentials || true
19+
20+
_restore_cache: &restore_cache
21+
keys:
22+
- v2-dependencies-{{ checksum "build.sbt" }}
23+
- v2-dependencies-
24+
25+
_save_cache: &save_cache
26+
key: v2-dependencies--{{ checksum "build.sbt" }}
27+
paths:
28+
- ~/.ivy2/cache
29+
- ~/.sbt
30+
- ~/.rf_cache
31+
32+
jobs:
33+
staticAnalysis:
34+
<<: *defaults
35+
36+
steps:
37+
- checkout
38+
- run: *setenv
39+
- restore_cache:
40+
<<: *restore_cache
41+
42+
- run: cat /dev/null | sbt dependencyCheck
43+
- run: cat /dev/null | sbt --debug dumpLicenseReport
44+
45+
- run: *unsetenv
46+
47+
- save_cache:
48+
<<: *save_cache
49+
- store_artifacts:
50+
path: datasource/target/scala-2.11/dependency-check-report.html
51+
destination: dependency-check-report-datasource.html
52+
- store_artifacts:
53+
path: experimental/target/scala-2.11/dependency-check-report.html
54+
destination: dependency-check-report-experimental.html
55+
- store_artifacts:
56+
path: core/target/scala-2.11/dependency-check-report.html
57+
destination: dependency-check-report-core.html
58+
- store_artifacts:
59+
path: pyrasterframes/target/scala-2.11/dependency-check-report.html
60+
destination: dependency-check-report-pyrasterframes.html
61+
62+
test:
63+
<<: *defaults
64+
resource_class: large
65+
steps:
66+
- checkout
67+
- run: *setenv
68+
- restore_cache:
69+
<<: *restore_cache
70+
71+
- run: sudo apt-get install python-pip pandoc && pip install setuptools # required for pyrasterframes testing
72+
- run: cat /dev/null | sbt test
73+
74+
- run: *unsetenv
75+
- save_cache:
76+
<<: *save_cache
77+
78+
publish:
79+
<<: *defaults
80+
resource_class: large
81+
steps:
82+
- checkout
83+
- run: *setenv
84+
- restore_cache:
85+
<<: *restore_cache
86+
87+
- run: sudo apt-get install python-pip pandoc && pip install setuptools # required for pyrasterframes testing
88+
- run: cat /dev/null | sbt test
89+
- run: cat /dev/null | sbt publish
90+
91+
- run: *unsetenv
92+
- save_cache:
93+
<<: *save_cache
94+
95+
it:
96+
<<: *defaults
97+
resource_class: xlarge
98+
steps:
99+
- checkout
100+
- run: *setenv
101+
102+
- restore_cache:
103+
<<: *restore_cache
104+
105+
- run:
106+
command: cat /dev/null | sbt it:test
107+
no_output_timeout: 30m
108+
- run: *unsetenv
109+
110+
- save_cache:
111+
<<: *save_cache
112+
113+
workflows:
114+
version: 2
115+
all:
116+
jobs:
117+
- test
118+
- it:
119+
filters:
120+
branches:
121+
only:
122+
- /astraea\/feature\/.*-its/
123+
- publish:
124+
filters:
125+
branches:
126+
only:
127+
- astraea/develop
128+
nightlyReleaseAstraea:
129+
triggers:
130+
- schedule:
131+
cron: "0 8 * * *"
132+
filters:
133+
branches:
134+
only:
135+
- astraea/develop
136+
jobs:
137+
- it
138+
- staticAnalysis

.scalafmt.conf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
maxColumn = 100
1+
maxColumn = 138
22
continuationIndent.defnSite = 2
3+
continuationIndent.callSite = 2
4+
continuationIndent.extendSite = 2
35
binPack.parentConstructors = true
46
binPack.literalArgumentLists = false
57
binPack.unsafeCallSite = true

.travis.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ language: scala
55
cache:
66
directories:
77
- $HOME/.ivy2/cache
8-
- $HOME/.sbt/boot/
8+
- $HOME/.sbt/boot
9+
- $HOME/.rf_cache
910

1011
scala:
1112
- 2.11.11
@@ -14,17 +15,23 @@ jdk:
1415
- oraclejdk8
1516

1617
addons:
17-
apt_packages:
18-
- pandoc
18+
apt:
19+
packages:
20+
- pandoc
21+
- python-pip
22+
23+
install:
24+
- pip install setuptools
1925

2026
sbt_args: -no-colors
2127

2228
script:
23-
- sbt -Dfile.encoding=UTF8 clean core/test datasource/test
29+
- sbt test
30+
- sbt it:test
2431
# - sbt -Dfile.encoding=UTF8 clean coverage test coverageReport
2532
# Tricks to avoid unnecessary cache updates
2633
- find $HOME/.sbt -name "*.lock" | xargs rm
2734
- find $HOME/.ivy2 -name "ivydata-*.properties" | xargs rm
2835

2936
#after_success:
30-
# - bash <(curl -s https://codecov.io/bash)
37+
# - bash <(curl -s https://codecov.io/bash)

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<img src="docs/src/main/paradox/_template/images/RasterFramesLogo.png" width="300px"/><sup style="vertical-align: top;">&trade;</sup>
22

3-
[![Build Status](https://travis-ci.org/locationtech/rasterframes.svg?branch=master)](https://travis-ci.org/s22s/raster-frames)
43
[![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)
54

65
_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/).

0 commit comments

Comments
 (0)