diff --git a/.github/environment.yml b/.github/environment.yml new file mode 100644 index 0000000..65bd6ab --- /dev/null +++ b/.github/environment.yml @@ -0,0 +1,28 @@ +name: cities-cif +channels: + - conda-forge +dependencies: + - python=3.10 + - earthengine-api=0.1.379 + - geocube=0.4.2 + - geopandas=0.14.4 + - rioxarray=0.15.0 + - odc-stac=0.3.8 + - pystac-client=0.7.5 + - pytest=7.4.3 + - xarray-spatial=0.3.7 + - xee=0.0.15 + - utm=0.7.0 + - osmnx=1.9.0 + - dask[complete]=2023.11.0 + - matplotlib=3.8.2 + - jupyterlab=4.0.10 + - s3fs=2024.5.0 + - geemap=0.32.0 + - pip=23.3.1 + - boto3=1.34.124 + - scikit-learn=1.5.1 + - scikit-image=0.24.0 + - exactextract=0.2.0 + - pip: + - overturemaps==0.6.0 \ No newline at end of file diff --git a/.github/workflows/dev_ci_cd.yml b/.github/workflows/dev_ci_cd_conda.yml similarity index 61% rename from .github/workflows/dev_ci_cd.yml rename to .github/workflows/dev_ci_cd_conda.yml index 6701372..31beaac 100644 --- a/.github/workflows/dev_ci_cd.yml +++ b/.github/workflows/dev_ci_cd_conda.yml @@ -1,4 +1,4 @@ -name: Dev CIF API CI/CD +name: Dev CIF API CI/CD Conda on: pull_request: @@ -13,25 +13,29 @@ jobs: max-parallel: 4 matrix: python-version: ["3.10"] - steps: - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v5 with: + auto-update-conda: true python-version: ${{ matrix.python-version }} - name: Install Linux dependencies run: | sudo apt update sudo apt install -y gdal-bin libgdal-dev - - name: Install Packages + - name: Install Packages in environment.yml file + run: | + $CONDA/bin/conda env update --file=.github/environment.yml --name base + - name: Install other packages run: | - python -m pip install --upgrade pip - pip install -r .github/requirements.txt - pip install GDAL==`gdal-config --version` + $CONDA/bin/conda install gdal --yes + $CONDA/bin/conda upgrade numpy --yes + $CONDA/bin/conda install pytest --yes - name: Run Tests + shell: bash -l {0} env: GOOGLE_APPLICATION_USER: ${{ secrets.GOOGLE_APPLICATION_USER }} - GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} + GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} run: | - pytest tests + $CONDA/bin/pytest tests \ No newline at end of file diff --git a/.github/workflows/dev_ci_cd_pip.yml b/.github/workflows/dev_ci_cd_pip.yml new file mode 100644 index 0000000..add6674 --- /dev/null +++ b/.github/workflows/dev_ci_cd_pip.yml @@ -0,0 +1,37 @@ +#name: Dev CIF API CI/CD PIP +# +#on: +# pull_request: +# workflow_dispatch: +# +#permissions: +# contents: read +#jobs: +# build: +# runs-on: ubuntu-latest +# strategy: +# max-parallel: 4 +# matrix: +# python-version: ["3.10"] +# +# steps: +# - uses: actions/checkout@v4 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v5 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Install Linux dependencies +# run: | +# sudo apt update +# sudo apt install -y gdal-bin libgdal-dev +# - name: Install Packages +# run: | +# python -m pip install --upgrade pip +# pip install -r .github/requirements.txt +# pip install GDAL==`gdal-config --version` +# - name: Run Tests +# env: +# GOOGLE_APPLICATION_USER: ${{ secrets.GOOGLE_APPLICATION_USER }} +# GOOGLE_APPLICATION_CREDENTIALS: ${{ secrets.GOOGLE_APPLICATION_CREDENTIALS }} +# run: | +# pytest tests diff --git a/environment.yml b/environment.yml index a064834..7d671ee 100644 --- a/environment.yml +++ b/environment.yml @@ -22,7 +22,7 @@ dependencies: - pip=23.3.1 - boto3=1.34.124 - scikit-learn=1.5.1 - - scikit-image==0.24.0 - - exactextract=0.2.0.dev252 + - scikit-image=0.24.0 + - exactextract=0.2.0 - pip: - overturemaps==0.6.0 diff --git a/setup.py b/setup.py index 7d9242c..74f0270 100644 --- a/setup.py +++ b/setup.py @@ -31,6 +31,7 @@ "exactextract<=0.2.0.dev252", "overturemaps", "scikit-learn>=1.5.1", - "scikit-image>=0.24.0" + "scikit-image>=0.24.0", + "exactextract>=0.2.0" ], )