Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DOCS] Upgrade GitHub Action to Ubuntu 22.04 #790

Merged
merged 5 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
build:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: true
matrix:
Expand All @@ -27,7 +27,7 @@ jobs:
- spark: 3.3.0
scala: 2.12.15
jdk: '11'
skipTests: '-DskipTests'
skipTests: ''
- spark: 3.2.3
scala: 2.12.15
jdk: '8'
Expand Down Expand Up @@ -55,18 +55,17 @@ jobs:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- run: git submodule update --init --recursive # Checkout Git submodule if necessary
- env:
SPARK_VERSION: ${{ matrix.spark }}
SCALA_VERSION: ${{ matrix.scala }}
SKIP_TESTS: ${{ matrix.skipTests }}
run: mvn -q clean install -Dscala=${SCALA_VERSION:0:4} -Dspark.version=${SPARK_VERSION} ${SKIP_TESTS}
- run: mkdir staging
- run: cp core/target/sedona-*.jar staging
- run: cp sql/target/sedona-*.jar staging
- run: cp viz/target/sedona-*.jar staging
- run: cp python-adapter/target/sedona-*.jar staging
- run: cp spark-shaded/target/sedona-*.jar staging
- run: |
[ -d "flink-shaded/target/" ] && cp flink-shaded/target/sedona-*.jar staging 2>/dev/null || true
- uses: actions/upload-artifact@v2
with:
name: generated-jars
path: staging
path: staging
5 changes: 2 additions & 3 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
matrix:
include:
Expand Down Expand Up @@ -58,7 +58,6 @@ jobs:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- run: git submodule update --init --recursive # Checkout Git submodule if necessary
- env:
SPARK_VERSION: ${{ matrix.spark }}
SCALA_VERSION: ${{ matrix.scala }}
Expand All @@ -71,7 +70,7 @@ jobs:
SPARK_VERSION: ${{ matrix.spark }}
HADOOP_VERSION: ${{ matrix.hadoop }}
run: tar -xzf spark-${SPARK_VERSION}-bin-hadoop${HADOOP_VERSION}.tgz
- run: sudo apt-get -y install python3-pip python-dev
- run: sudo apt-get -y install python3-pip python-dev-is-python3
- run: sudo pip3 install -U setuptools
- run: sudo pip3 install -U wheel
- run: sudo pip3 install -U virtualenvwrapper
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
jobs:
build:

runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: true
matrix:
Expand Down
24 changes: 0 additions & 24 deletions python/tests/utils/test_crs_transformation.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,27 +159,3 @@ def test_spatial_join_query_with_polygon_rdd_using_index(self):
if data[1].__len__() != 0:
for right_data in data[1]:
assert right_data.getUserData() is not None

def test_polygon_distance_join_with_crs_transformation(self):
query_rdd = PolygonRDD(
self.sc,
input_location_query_polygon, splitter, True,
num_partitions, StorageLevel.MEMORY_ONLY, "epsg:4326", "epsg:3857"
)
window_rdd = CircleRDD(query_rdd, 0.1)

object_rdd = PolygonRDD(
self.sc, input_location_query_polygon, splitter, True, num_partitions, StorageLevel.MEMORY_ONLY,
"epsg:4326", "epsg:3857")

object_rdd.rawJvmSpatialRDD.jsrdd.repartition(4)
object_rdd.spatialPartitioning(GridType.KDBTREE)
object_rdd.buildIndex(IndexType.RTREE, True)
window_rdd.spatialPartitioning(object_rdd.getPartitioner())

results = JoinQuery.DistanceJoinQuery(object_rdd, window_rdd, True, False).collect()
assert 5467 == results.__len__()

for data in results:
for polygon_data in data[1]:
assert Circle(data[0].geom, 0.1).covers(polygon_data.geom)