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

46 implement actris ebas reader #48

Draft
wants to merge 43 commits into
base: main-dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f64a23e
initial setup of ActrisEbas reader
Aug 29, 2024
5476742
make naming consistent
Aug 29, 2024
0c40de8
typo
Aug 29, 2024
089aa2d
add response data for easy testing
Aug 29, 2024
e024d13
add definition file for connection between pyaerocom <=> EBAS variables
Aug 29, 2024
3f28569
add small netcdf file to testdata for local testing
Aug 29, 2024
37a7970
WIP: start simple
Sep 3, 2024
14190d7
WIP: try reading actual data
Sep 4, 2024
49a99a6
WIP after reading 1st data file
Sep 6, 2024
964d3bc
added another cache file
Sep 8, 2024
e899e6a
Merge remote-tracking branch 'origin/main-dev' into 46-implement-actr…
Sep 9, 2024
ae83616
WIP: try reading actual data
Sep 9, 2024
bb45f75
WIP: 1st version with passing tests
Sep 9, 2024
647dd11
linting
Sep 9, 2024
cb2217a
addjst to cached API response for CI
Sep 9, 2024
42dc4eb
include toml files
Sep 9, 2024
c5b92a6
add json file
Sep 9, 2024
2dd3ff3
replace np.NAN with np.nan
Sep 9, 2024
52a873b
WIP
Sep 9, 2024
a900ef6
WIP
Sep 10, 2024
4a7b795
linting
Sep 10, 2024
d140802
linting
Sep 10, 2024
0692e97
WIP: potential filtering problem with pyaro
Sep 11, 2024
c164d67
WIP: ozone reading working
Sep 17, 2024
42c905b
WIP: ozone reading with pyaerocom variable name working
Sep 17, 2024
316171b
WIP: ozone reading with pyaerocom variable name working
Sep 17, 2024
2f6bcaf
linting
Sep 17, 2024
8a0a41a
WIP: started applying flags
Sep 17, 2024
e763f2c
use paginated API
Sep 19, 2024
d29b037
adjusted logging
Sep 19, 2024
c018de1
bum version
Sep 19, 2024
787619c
bump pyaro version
Sep 19, 2024
b926de9
correct pyaro version
Sep 19, 2024
b39fdbd
WIP
Sep 19, 2024
f10bdb3
test updated CI.yml
Sep 19, 2024
284ac3b
optimised imports
Sep 19, 2024
4305ce6
linting with Pytyhon 3.10
Sep 19, 2024
f66f699
WIP getting pyaerocom variable concso4t to work properly
Sep 20, 2024
c231676
WIP: added more variables
Sep 23, 2024
d564d7c
WIP
Oct 1, 2024
a448c32
bump version
Oct 17, 2024
511a749
WIP read data with seperate read() call instead of start reading duri…
Oct 18, 2024
29fd93f
Merge remote-tracking branch 'origin/46-implement-actris-ebas-reader'…
Oct 18, 2024
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
15 changes: 7 additions & 8 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@ on: [push, pull_request]
jobs:
lint:
runs-on: ubuntu-latest
env:
PYTHON: 3.9

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
lfs: 'true'
- name: Set up Python ${{ env.PYTHON }}
uses: actions/setup-python@v4
- name: Set up Python 3.10
uses: actions/setup-python@v5
with:
python-version: ${{ env.PYTHON }}
python-version: "3.10"
- name: Python info
run: |
which python
Expand Down Expand Up @@ -44,11 +43,11 @@ jobs:
run: |
sudo apt update
sudo apt install libudunits2-dev
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
lfs: 'true'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Python info
Expand Down
9 changes: 5 additions & 4 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = pyaro_readers
version = 0.0.10.dev1
version = 0.0.10.dev4
author = MET Norway
description = implementations of pyaerocom reading plugings using pyaro as interface
long_description = file: README.md
Expand All @@ -21,7 +21,7 @@ url = https://github.com/metno/pyaro-readers
[options]
python_version = >=3.10
install_requires =
pyaro >= 0.0.10
pyaro >= 0.0.12
geocoder_reverse_natural_earth >= 0.0.2
netCDF4
requests
Expand All @@ -43,7 +43,7 @@ test_require = tox:tox
where=src

[options.package_data]
* = *.csv
* = *.csv, *.toml, *.json

[options.entry_points]
pyaro.timeseries =
Expand All @@ -54,6 +54,7 @@ pyaro.timeseries =
netcdf_rw = pyaro_readers.netcdf_rw:Netcdf_RWTimeseriesEngine
harp = pyaro_readers.harpreader:AeronetHARPEngine
nilupmfabsorption = pyaro_readers.nilupmfabsorptionreader:NILUPMFAbsorptionTimeseriesEngine
actrisebas = pyaro_readers.actrisebas:ActrisEbasTimeSeriesEngine
nilupmfebas = pyaro_readers.nilupmfebas:EbasPmfTimeseriesEngine


Expand All @@ -63,7 +64,7 @@ min_version = 4.0
skip_missing_interpreters = True
isolated_build = True
env_list =
py310
py311
format
#depends =

Expand Down
Loading
Loading