Skip to content
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
6 changes: 3 additions & 3 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.9
uses: actions/setup-python@v2
- uses: actions/checkout@v3
- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: 3.x
- name: Install dependencies
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/testrunner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Github repo with LFS
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
lfs: true
- name: Set up Python 3.9
uses: actions/setup-python@v2
- name: Set up Python 3.12
uses: actions/setup-python@v4
with:
python-version: 3.9
python-version: 3.12
- name: Install dependencies
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ classifiers =
#scripts=scripts, scripts = ['create_sidecar_files.py']
[options]
packages = find:
python_requires = >=3.7
python_requires = >=3.12
install_requires =
pyhdf>=0.10.5
numpy>=1.23.1
numpy>=2.2.1
netCDF4>=1.6.0
xarray>=2022.6.0
pystare>=0.8.9
Expand Down
2 changes: 1 addition & 1 deletion staremaster/create_sidecar_files.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def list_granules(folder, product):
if not product:
product = ''
files = glob.glob(folder + '/*')
pattern = '.*{product}.*[^_stare]\.(nc|hdf|HDF5)'.format(product=product.upper())
pattern = rf'.*{product}.*[^_stare]\.(nc|hdf|HDF5)'.format(product=product.upper())
granules = list(filter(re.compile(pattern).match, files))
return granules

Expand Down
8 changes: 4 additions & 4 deletions staremaster/find_missing_sidecars.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

def get_granule_paths(folder, granule_pattern):
granule_paths = sorted(glob.glob(os.path.expanduser(folder) + '/' + '*' ))
pattern = '.*/{}.*[^_stare]\.(nc|hdf|HDF5)'.format(granule_pattern)
granule_paths = list(filter(re.compile(pattern).match, granule_paths))
pattern = rf'.*/{granule_pattern}.*[^_stare]\.(nc|hdf|HDF5)'
granule_paths = list(filter(re.compile(pattern).match, granule_paths))
return granule_paths


def get_sidecar_paths(folder, granule_pattern):
sidecar_paths = sorted(glob.glob(os.path.expanduser(folder) + '/' + '*' ))
pattern = '.*/{}.*_stare\.(nc|hdf|HDF5)'.format(granule_pattern)
sidecar_paths = list(filter(re.compile(pattern).match, sidecar_paths))
pattern = rf'.*/{granule_pattern}.*_stare\.(nc|hdf|HDF5)'
sidecar_paths = list(filter(re.compile(pattern).match, sidecar_paths))
return sidecar_paths


Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py36,py37,py38,py39
envlist = py312,py313

[testenv]
changedir = tests
Expand Down