Skip to content

Commit 298a58f

Browse files
author
Sean Sullivan
committed
Merge remote-tracking branch 'origin/master'
2 parents 49e0668 + 9947f92 commit 298a58f

File tree

3 files changed

+44
-9
lines changed

3 files changed

+44
-9
lines changed

.github/workflows/release.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: "Publish Release Docker Image"
2+
3+
on:
4+
push:
5+
tags: '*'
6+
7+
env:
8+
REGISTRY: ghcr.io
9+
10+
jobs:
11+
build-and-push-image:
12+
runs-on: ubuntu-latest
13+
14+
permissions:
15+
contents: read
16+
packages: write
17+
18+
steps:
19+
- uses: actions/checkout@v2
20+
- uses: docker/login-action@v2
21+
with:
22+
registry: ${{ env.REGISTRY }}
23+
username: ${{ github.actor }}
24+
password: ${{ secrets.GITHUB_TOKEN }}
25+
- uses: docker/metadata-action@v4
26+
id: meta
27+
with:
28+
images: ${{ env.REGISTRY }}/spectriclabs/elastic_datashader
29+
tags: |
30+
type=ref,event=tag
31+
type=raw,value=latest
32+
- uses: docker/build-push-action@v3
33+
with:
34+
context: .
35+
push: true
36+
tags: ${{ steps.meta.outputs.tags }}
37+
labels: ${{ steps.meta.outputs.labels }}

.github/workflows/CI.yml renamed to .github/workflows/test.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
# This workflow will install Python dependencies, run tests and lint with a variety of Python versions
2-
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
3-
4-
name: "Build, Test, and Publish"
1+
name: "Build, Test, and Publish Test Docker Image"
52

63
on:
74
push:
@@ -58,6 +55,7 @@ jobs:
5855
images: ${{ env.REGISTRY }}/spectriclabs/elastic_datashader
5956
tags: |
6057
type=raw,value=${{ env.timestamp }}
58+
type=raw,value=test
6159
- uses: docker/build-push-action@v3
6260
with:
6361
context: .

pyproject.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ elastic_datashader = "elastic_datashader.cli:main"
2121

2222
[tool.poetry.dependencies]
2323
python = ">=3.8,<4"
24-
elasticsearch = ">=7.16"
25-
elasticsearch-dsl = ">=7.4"
26-
datashader = ">=0.11.0"
24+
elasticsearch = "7.17.4"
25+
elasticsearch-dsl = "7.4.0"
26+
datashader = "0.14.2"
2727
pandas = "*"
2828
colorcet = "*"
29-
mercantile = ">=1.2"
29+
mercantile = "1.2.1"
3030
pypng = "*"
3131
Pillow = "*"
3232
pynumeral = "*"
@@ -38,7 +38,7 @@ PyYAML = "*"
3838
humanize = "*"
3939
uvicorn = {extras = ["standard"], version = "^0.18.2", optional = true}
4040
fastapi = "^0.73.0"
41-
georgio = "^2022.84.833"
41+
georgio = "2022.225.1340"
4242

4343
[tool.poetry.dev-dependencies]
4444
pytest = "*"

0 commit comments

Comments
 (0)