Skip to content

Commit

Permalink
Merge 94bc2a4 into 712135b
Browse files Browse the repository at this point in the history
  • Loading branch information
sgillies committed Feb 17, 2022
2 parents 712135b + 94bc2a4 commit 8df3411
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: |
./ci/install_geos.sh
python -m pip install --upgrade pip build
python -m pip install -r requirements-dev.txt
python -m pip install cython==0.29.28 oldest-supported-numpy
python -m build --sdist
- uses: actions/upload-artifact@v2
Expand Down
3 changes: 2 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ recursive-include tests *.py *.txt
recursive-include shapely/examples *.py
recursive-include shapely/speedups *.pyx
recursive-include shapely/vectorized *.pyx
recursive-include shapely *.pxi
recursive-include shapely *.pxi *.pxd *.pyx
recursive-exclude shapely *.c
recursive-include shapely/DLLs *.dll *.rst *.txt
include docs/*.rst
2 changes: 1 addition & 1 deletion ci/install_geos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ build_geos(){
if [ "$RUNNER_OS" = "Windows" ]; then
export CMAKE_GENERATOR=Ninja
fi
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$GEOS_INSTALL -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_CXX_FLAGS="-g -O2" -DCMAKE_C_FLAGS="-g -O2" ..
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$GEOS_INSTALL -DCMAKE_INSTALL_LIBDIR=lib ..
cmake --build . -j 4
cmake --install .
}
Expand Down
2 changes: 1 addition & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cython==0.29.24
cython>=0.29.24
descartes==1.0.1
matplotlib
numpy>=1.4.1
Expand Down

0 comments on commit 8df3411

Please sign in to comment.