diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index 8d8dd00c..dd75ab22 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -78,7 +78,6 @@ jobs: pip install --upgrade pip pip install numpy==1.26.4 pip install geopandas shapely networkx owslib map2model beartype gdal pytest scikit-learn - pip install git+https://github.com/loop3d/loopprojectfile.git@fix_thicknesses pip install --no-cache dist/*.tar.gz pip list @@ -153,8 +152,6 @@ jobs: pip install --upgrade pip pip install numpy==1.26.4 pip install -r dependencies.txt - pip uninstall loopprojectfile -y - pip install git+https://github.com/loop3d/loopprojectfile.git@fix_thicknesses pip install --no-cache --pre --no-index --find-links dist map2loop pip list @@ -188,8 +185,6 @@ jobs: conda install -c conda-forge conda-build anaconda-client conda-verify -y conda install -c loop3d -c conda-forge --file dependencies.txt -y - pip uninstall loopprojectfile -y - pip install git+https://github.com/loop3d/loopprojectfile.git@fix_thicknesses conda install pytest -y - name: Building and install diff --git a/dependencies.txt b/dependencies.txt index 6648153e..2c281806 100644 --- a/dependencies.txt +++ b/dependencies.txt @@ -5,7 +5,7 @@ shapely networkx owslib map2model -loopprojectfile==0.2.1 +loopprojectfile==v0.2.1 beartype gdal==3.8.4 pytest diff --git a/docs/Dockerfile b/docs/Dockerfile index d550cac5..ad79afa9 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -25,11 +25,6 @@ COPY dependencies.txt dependenciesdocs.txt RUN cat ./docs/requirements.txt >> dependenciesdocs.txt RUN conda install -c conda-forge -c loop3d --file dependenciesdocs.txt -y -#temporary code to align with fix_thicknesses branch -RUN pip uninstall loopprojectfile -y -RUN pip install git+https://github.com/loop3d/loopprojectfile.git@fix_thicknesses -#### - RUN pip install . WORKDIR /