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

Use preprocessed OGGM data and migrate to pure Julia instead of relying on PyCall #65

Merged
merged 46 commits into from
Jan 23, 2025
Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
2c002fd
Add version number to all dependencies
facusapienza21 Mar 23, 2024
8093129
Update CI.yml with new micromamba version
facusapienza21 Mar 23, 2024
b5a291c
Update environment.yml
facusapienza21 Mar 23, 2024
01e1ff5
Changing python imports
facusapienza21 Sep 17, 2024
79b0152
Python environment working in local - testing CI
facusapienza21 Oct 21, 2024
adc7386
Update CI.yml - Testing in multiple versions & OS
facusapienza21 Oct 21, 2024
01edc7c
Update CI.yml
facusapienza21 Oct 21, 2024
821453e
Remove cache environments
facusapienza21 Oct 21, 2024
c7648d1
Remove unnecessary `which python`
facusapienza21 Oct 21, 2024
6ddcb54
Update CI.yml - bring some specific os info
facusapienza21 Oct 22, 2024
deb1594
Rename environment
facusapienza21 Oct 22, 2024
176bd07
Update CI.yml - Ask more network variables
facusapienza21 Oct 22, 2024
1302677
Update CI.yml - typo in NetworkOptions
facusapienza21 Oct 22, 2024
71fcf9b
Ping path for Mac - not working for Ubuntu
facusapienza21 Oct 22, 2024
af7d47d
Update CI.yml - checking path
facusapienza21 Oct 22, 2024
bdda962
Update CI.yml
facusapienza21 Oct 22, 2024
418a185
Update CI.yml
facusapienza21 Oct 22, 2024
c254196
Update CI.yml
facusapienza21 Oct 22, 2024
2c13164
Update CI.yml
facusapienza21 Oct 22, 2024
d629776
Update CI.yml
facusapienza21 Oct 22, 2024
d27e780
Update config.jl - remove catch warning
facusapienza21 Oct 22, 2024
7e4a601
Update CI.yml - Now maybe exporiting global env variable
facusapienza21 Oct 22, 2024
27776d2
Update CI.yml - Fix export on environmnet names
facusapienza21 Oct 23, 2024
f071680
Update CI.yml - bump micromamba version
facusapienza21 Oct 24, 2024
132be5f
testing idea from the discourse
facusapienza21 Oct 29, 2024
ef7c2ef
Update CI.yml
facusapienza21 Oct 29, 2024
b5f34fb
Update action version of `checkout` and `setup-python`
facusapienza21 Oct 30, 2024
7f192ae
Update CI.yml - fix typo with SSH -> SSL
facusapienza21 Oct 30, 2024
ebd4e2e
Update CI.yml - export SSL_CERT_FILE
facusapienza21 Oct 30, 2024
854b254
Update CI.yml - Change Python path
facusapienza21 Oct 30, 2024
6a63679
Update CI.yml
facusapienza21 Oct 30, 2024
5db9338
Update CI.yml
facusapienza21 Oct 30, 2024
04a6cb4
Update CI.yml - Trying to reproduce past behaviour
facusapienza21 Oct 30, 2024
a003351
Update CI.yml
facusapienza21 Oct 30, 2024
31e88b1
Update config.jl - remove try's
facusapienza21 Oct 30, 2024
0e78369
Update CI.yml - Julia 1.11
facusapienza21 Oct 30, 2024
365ede1
Update CI.yml - remove Python setup and let this to micromamba
facusapienza21 Oct 31, 2024
5e7f7ef
Update CI.yml - conda -> micromamba for environment inspection
facusapienza21 Oct 31, 2024
3df54af
Remove some redundancy and things that may fail
facusapienza21 Nov 8, 2024
2928298
Update CI.yml
facusapienza21 Nov 8, 2024
33fa69e
Update CI.yml
facusapienza21 Nov 8, 2024
1af50dd
[WIP] Removing Python dependencies and migrating to Rasters.jl
JordiBolibar Jan 15, 2025
2eb9672
Remove environment.yml file
JordiBolibar Jan 15, 2025
f1c763d
[WIP] continue the migration, tests of params_construction.jl are pas…
albangossard Jan 15, 2025
0604755
Migrate to pure julia (#62)
albangossard Jan 23, 2025
f7fdbc1
fix dependencies after rebase
albangossard Jan 23, 2025
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
Prev Previous commit
Next Next commit
Python environment working in local - testing CI
facusapienza21 authored and albangossard committed Jan 23, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 79b0152e86ea8eb4be144d764f1a854889813101
3 changes: 1 addition & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f"
Infiltrator = "5903a43b-9cc3-4c30-8d17-598619ec4e9b"
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
OpenSSL_jll = "458c3c95-2e84-50aa-8efc-19380b2a3a95"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
PreferenceTools = "ba661fbb-e901-4445-b070-854aec6bfbc5"
PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
@@ -22,10 +23,8 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[compat]
CairoMakie = "0.11"
Downloads = "1"
HDF5 = "0.17"
Infiltrator = "1"
JLD2 = "0.4"
PreferenceTools = "0.1.2"
PythonCall = "0.9.23"
71 changes: 35 additions & 36 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,49 +1,48 @@
name: oggm_env_20240917_ssl
name: oggm_env_20241021_oldOGGM

channels:
- conda-forge

dependencies:
# Base language runtimes
- python<3.12
- python<=3.12

# Python packages
- bottleneck
- cartopy
- configobj
- dask
- gdal
- geopandas
- ipython
- jupyter
- jupyterlab
- matplotlib
- motionless
- netcdf4
- bottleneck=1.3
- cartopy=0.22
- configobj=5.0
- dask=2024.3
- gdal=3.8
- geopandas=0.14
- ipython=8.22
- jupyter=1.0
- jupyterlab=4.1
- matplotlib=3.8
- motionless=1.3
- netcdf4=1.6
# - numpy=1.26
- numpy<2.0
- numpydoc
- openssl=3.0
- pandas
- Pillow
- pip
- pyproj
- pytables
- pytest
- rasterio
- rioxarray
- salem
- seaborn
- shapely
- scikit-image
- scikit-learn
- scipy
- xarray
- numpydoc=1.6
- pandas=2.2
- Pillow=10.2
- pip=24.0
- pyproj=3.6
- pytables=3.9
- pytest=8.1
- rasterio=1.3
- rioxarray=0.15
- salem=0.3
- seaborn=0.13
- shapely=2.0
- scikit-image=0.22
- scikit-learn=1.4
- scipy=1.12
- xarray=2024.2

# Packages installed through pip
- pip:
- joblib
- progressbar2
- git+https://github.com/OGGM/pytest-mpl
- joblib==1.3
- progressbar2==4.4
- git+https://github.com/OGGM/oggm.git@9d173038862f36a21838034da07243bd189ef2d0
- git+https://github.com/OGGM/massbalance-sandbox
- oggm
- certifi
- certifi