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

Remove web components and rclone workflow #189

Merged
merged 5 commits into from
Apr 10, 2024
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
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
version: 2
updates:
- package-ecosystem: 'github-actions'
directory: '/'
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: 'monthly'
interval: "monthly"
groups:
actions:
patterns:
- '*'
- "*"
21 changes: 2 additions & 19 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,6 @@ concurrency:
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [14.x, 16.x]

steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm install
working-directory: ./web
- run: npm run build --if-present
working-directory: ./web

test:
name: test-py${{ matrix.python }}-${{matrix.CARBONPLAN_DATA}}
runs-on: ubuntu-latest
Expand All @@ -37,10 +20,10 @@ jobs:
strategy:
fail-fast: false
matrix:
python: ['3.9', '3.10', '3.11']
python: ["3.9", "3.10", "3.11"]
CARBONPLAN_DATA: [
# 'https://carbonplan.blob.core.windows.net/carbonplan-data',
'gs://carbonplan-data',
"gs://carbonplan-data",
]
steps:
- uses: actions/checkout@v4
Expand Down
29 changes: 0 additions & 29 deletions .github/workflows/rclone.yaml

This file was deleted.

25 changes: 5 additions & 20 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ci:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -18,7 +18,7 @@ repos:
hooks:
- id: pyupgrade
args:
- '--py38-plus'
- "--py38-plus"

- repo: https://github.com/psf/black
rev: 24.3.0
Expand All @@ -32,10 +32,10 @@ repos:
- id: blackdoc

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: 'v0.3.5'
rev: "v0.3.5"
hooks:
- id: ruff
args: ['--fix']
args: ["--fix"]

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v4.0.0-alpha.8
Expand All @@ -48,22 +48,7 @@ repos:
- id: nbstripout

- repo: https://github.com/pre-commit/mirrors-prettier
rev: 'v4.0.0-alpha.8'
hooks:
- id: prettier
files: "\\.(\
css|less|scss\
|graphql|gql\
|html\
|js|jsx\
|json\
|ts|tsx\
|vue\
|yaml|yml\
)$"

- repo: https://github.com/pre-commit/mirrors-prettier
rev: 'v4.0.0-alpha.8'
rev: "v4.0.0-alpha.8"
hooks:
- id: prettier
name: prettier-markdown
Expand Down
8 changes: 0 additions & 8 deletions .prettierrc.json

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
**data catalog and curation**

[![CI](https://github.com/carbonplan/data/actions/workflows/main.yaml/badge.svg)](https://github.com/carbonplan/data/actions/workflows/main.yaml)
![PyPI](https://img.shields.io/pypi/v/carbonplan-data)
[![PyPI](https://img.shields.io/pypi/v/carbonplan-data)](https://pypi.org/project/carbonplan-data/)
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)

This repository includes our main data catalog as well as our pre-processing utilities.
Expand Down Expand Up @@ -59,7 +59,7 @@ Catalog entries scan be marked as either _skip_ or _xfail_ by setting the `ci` k

```yaml
foo:
description: 'skip this entry in the CI tests'
description: "skip this entry in the CI tests"
metadata:
ci: skip
```
Expand Down
4 changes: 2 additions & 2 deletions carbonplan_data/catalogs/fia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ sources:
veg_visit,
]
args:
urlpath: '{{env(CARBONPLAN_DATA)}}/raw/fia/{{ name }}.parquet'
engine: 'pyarrow'
urlpath: "{{env(CARBONPLAN_DATA)}}/raw/fia/{{ name }}.parquet"
engine: "pyarrow"
4 changes: 2 additions & 2 deletions carbonplan_data/catalogs/fluxnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ sources:
allowed: [auxmeteo, auxnee]
driver: parquet
args:
urlpath: '{{env(CARBONPLAN_DATA)}}/raw/fluxnet/{{ station }}_{{ kind }}.parquet'
urlpath: "{{env(CARBONPLAN_DATA)}}/raw/fluxnet/{{ station }}_{{ kind }}.parquet"

raw_fullset:
metadata:
Expand Down Expand Up @@ -82,4 +82,4 @@ sources:
allowed: [dd, hh, mm, ww, yy]
driver: parquet
args:
urlpath: '{{env(CARBONPLAN_DATA)}}/raw/fluxnet/{{ station }}_{{ kind }}_{{ freq }}.parquet'
urlpath: "{{env(CARBONPLAN_DATA)}}/raw/fluxnet/{{ station }}_{{ kind }}_{{ freq }}.parquet"
2 changes: 1 addition & 1 deletion carbonplan_data/catalogs/gcp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ sources:
]
driver: parquet
args:
urlpath: '{{env(CARBONPLAN_DATA)}}/raw/gcp/{{ name }}.parquet'
urlpath: "{{env(CARBONPLAN_DATA)}}/raw/gcp/{{ name }}.parquet"
34 changes: 17 additions & 17 deletions carbonplan_data/catalogs/gridmet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@ sources:
default: pr
allowed:
[
'pr',
'tmmn',
'tmmx',
'rmax',
'rmin',
'sph',
'srad',
'th',
'vs',
'bi',
'fm100',
'fm1000',
'erc',
'pdsi',
'etr',
'pet',
'vpd',
"pr",
"tmmn",
"tmmx",
"rmax",
"rmin",
"sph",
"srad",
"th",
"vs",
"bi",
"fm100",
"fm1000",
"erc",
"pdsi",
"etr",
"pet",
"vpd",
]
year:
description: year
Expand Down
2 changes: 1 addition & 1 deletion carbonplan_data/catalogs/grids.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ sources:
allowed: [conus, ak]
driver: zarr
args:
urlpath: '{{env(CARBONPLAN_DATA)}}/processed/grids/{{ region }}/4000m/domain.zarr/'
urlpath: "{{env(CARBONPLAN_DATA)}}/processed/grids/{{ region }}/4000m/domain.zarr/"
consolidated: True
22 changes: 11 additions & 11 deletions carbonplan_data/catalogs/maca.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ sources:
default: pr
allowed:
[
'huss',
'pr',
'rhsmin',
'rhsmax',
'rsds',
'tasmax',
'tasmin',
'uas',
'vas',
'vpd',
"huss",
"pr",
"rhsmin",
"rhsmax",
"rsds",
"tasmax",
"tasmin",
"uas",
"vas",
"vpd",
]
gcm:
description: climate model
Expand All @@ -47,7 +47,7 @@ sources:
description: climate scenario
type: str
default: historical_1950_2005
allowed: ['historical_1950_2005', 'rcp45_2006_2099', 'rcp85_2006_2099']
allowed: ["historical_1950_2005", "rcp45_2006_2099", "rcp85_2006_2099"]
args:
urlpath: http://thredds.northwestknowledge.net:8080/thredds/dodsC/agg_macav2metdata_{{ variable }}_{{ gcm }}_r1i1p1_{{ scenario }}_CONUS_daily.nc
auth: null
Expand Down
Loading