From 1a4e3ed24f3dd3ced7db9ab05bfc5eae020ebf27 Mon Sep 17 00:00:00 2001 From: cmeikle Date: Mon, 13 Jan 2025 12:41:49 +0100 Subject: [PATCH 1/2] Added conda environment to be tested on the hub --- .gitignore | 2 ++ environment.yml | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 environment.yml diff --git a/.gitignore b/.gitignore index 32f77acd7..0f76a9261 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ venv out-logs __pycache__ +/mapies.egg-info/ +/build/ run/run-nord3.sh grids/__pycache__ util/__pycache__ diff --git a/environment.yml b/environment.yml new file mode 100644 index 000000000..acb7bd6d6 --- /dev/null +++ b/environment.yml @@ -0,0 +1,44 @@ +--- + +name: mapies_test + +channels: + - conda-forge + - anaconda + +dependencies: + - python=3.10 + - libnetcdf=*=mpi_mpich* + - netCDF4=*=mpi_mpich* + - h5py=*=mpi_mpich* + - mpi4py~=3.1.4 + - cartopy + # - pytest + # - pytest-cov + # - pycodestyle>=2.10.0 + # - geopandas>=0.10.2 + # - rtree>=0.9.0 + # - pandas>=1.3.5 + # - numpy>=1.20.0 + # - pyproj~=3.2.1 + # - setuptools>=66.1.1 + # - pytest>=7.2.1 + # - shapely + # - eccodes + # - python-eccodes + # - cfunits + # - sphinx + # - sphinx-rtd-theme + # - psutil + # - filelock + # - configargparse + # - pyyaml + # - rasterio + - pip + - pip: + - -r requirements.txt + +variables: + CC: mpicc + CXX: mpicxx + LDFLAGS: -shared -- GitLab From 339ff48239d3b3a9c61ede79d8f7e4fb82445c7e Mon Sep 17 00:00:00 2001 From: Calum Meikle Date: Mon, 13 Jan 2025 18:23:42 +0100 Subject: [PATCH 2/2] Removed dependency on requirements.txt --- environment.yml | 32 ++++++++------------------------ requirements.txt | 2 +- setup.py | 2 +- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/environment.yml b/environment.yml index acb7bd6d6..de9580fdf 100644 --- a/environment.yml +++ b/environment.yml @@ -1,6 +1,6 @@ --- -name: mapies_test +name: mapies channels: - conda-forge @@ -13,30 +13,14 @@ dependencies: - h5py=*=mpi_mpich* - mpi4py~=3.1.4 - cartopy - # - pytest - # - pytest-cov - # - pycodestyle>=2.10.0 - # - geopandas>=0.10.2 - # - rtree>=0.9.0 - # - pandas>=1.3.5 - # - numpy>=1.20.0 - # - pyproj~=3.2.1 - # - setuptools>=66.1.1 - # - pytest>=7.2.1 - # - shapely - # - eccodes - # - python-eccodes - # - cfunits - # - sphinx - # - sphinx-rtd-theme - # - psutil - # - filelock - # - configargparse - # - pyyaml - # - rasterio + - pandas + - geopandas + - numpy + - dask + - xarray + - pytest + - pyYAML - pip - - pip: - - -r requirements.txt variables: CC: mpicc diff --git a/requirements.txt b/requirements.txt index 7ad86ce97..3680bbfc2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -./ + attrs==24.2.0 Cartopy==0.21.1 certifi==2024.8.30 diff --git a/setup.py b/setup.py index b2e6abad5..d327a0a15 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ from setuptools import find_packages from setuptools import setup # Could update this using versioneer -version="0.0.5" +version="0.0.6" setup( name="mapies", -- GitLab