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
2 changes: 1 addition & 1 deletion .github/ci-hpc-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ build:
- ECCODES_DEFINITION_PATH=$ECCODES_DIR/share/eccodes/definitions
- GITHUB_WORKFLOW=anything
parallel: 64
requirements: tests/downstream-ci-requirements.txt
toml_opt_dep_sections: all,test,ci
pytest_cmd: |
python -m pytest -vv -m 'not notebook and not no_cache_init' --cov=. --cov-report=xml
python -m pytest -v -m 'notebook'
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
rev: v6.0.0
hooks:
- id: trailing-whitespace # Trailing whitespace checker
- id: end-of-file-fixer # Ensure files end in a newline
Expand Down
24 changes: 1 addition & 23 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COV_REPORT := html
setup:
pre-commit install

default: qa unit-tests type-check
default: qa unit-tests

qa:
pre-commit run --all-files
Expand All @@ -15,25 +15,3 @@ unit-tests:
python -m pytest -vv -m 'not notebook and not no_cache_init' --cov=. --cov-report=$(COV_REPORT)
python -m pytest -v -m "notebook"
python -m pytest --forked -vv -m 'no_cache_init'

# type-check:
# python -m mypy .

conda-env-update:
$(CONDA) env update $(CONDAFLAGS) -f environment.yml

docker-build:
docker build -t $(PROJECT) .

docker-run:
docker run --rm -ti -v $(PWD):/srv $(PROJECT)

template-update:
pre-commit run --all-files cruft -c .pre-commit-config-weekly.yaml

docs-build:
cd docs && rm -fr _api && make clean && make html

#integration-tests:
# python -m pytest -vv --cov=. --cov-report=$(COV_REPORT) tests/integration*.py
# python -m pytest -vv --doctest-glob='*.md'
16 changes: 10 additions & 6 deletions docs/source/development/conda.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,18 @@ First, clone the repository locally. You can use the following command:

git clone --branch develop git@github.com:ecmwf/earthkit-data.git


Next, enter your git repository and run the following commands:
Then, create a new environment and activate it:

.. code-block:: shell

make conda-env-update
conda create -n earthkit-data python=3.12
conda activate earthkit-data
make setup
pip install -e .

This will create a new conda environment called "earthkit-data" with all the dependencies installed into it. This setup enables the `pre-commit`_ hooks, performing a series of quality control checks on every commit. If any of these checks fails the commit will be rejected.
Lastly, enter your git repository and run the following commands:

.. code-block:: shell

pip install -e .[dev]
pre-commit install

This setup enables the `pre-commit`_ hooks, performing a series of quality control checks on every commit. If any of these checks fails the commit will be rejected.
64 changes: 0 additions & 64 deletions environment.yml

This file was deleted.

7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[build-system]
requires = ["setuptools>=61", "setuptools-scm>=8"]
requires = ["setuptools>=77", "setuptools-scm>=8"]

[project]
authors = [
Expand All @@ -8,13 +8,13 @@ authors = [
classifiers = [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3.13",
"Programming Language :: Python :: 3.14",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy"
]
Expand All @@ -41,7 +41,8 @@ dependencies = [
]
description = "A format-agnostic Python interface for geospatial data"
dynamic = ["version"]
license = {text = "Apache License Version 2.0"}
license = "Apache-2.0"
license-files = ["LICENSE"]
name = "earthkit-data"
readme = "README.md"
requires-python = ">=3.10"
Expand Down
65 changes: 0 additions & 65 deletions tests/environment-unit-tests.yml

This file was deleted.

Loading