kopia lustrzana https://github.com/inkstitch/inkstitch
Rejbasket/scipy fix (#1842)
* updates to workflow and requirements * Update requirements.txt removed pip flags causing build to fail Co-authored-by: rejbasket <rejbasket@users.noreply.github.com>pull/1839/head
rodzic
78769cda50
commit
9dfc0a2f5c
|
@ -26,9 +26,9 @@ jobs:
|
|||
id: pip-cache
|
||||
with:
|
||||
path: ~/.cache/pip
|
||||
key: ${{ runner.os }}-18.04-pip-${{ hashFiles('**/requirements.txt') }}
|
||||
key: ${{ runner.os }}-20.04-pip-${{ hashFiles('**/requirements.txt') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-18.04-pip-
|
||||
${{ runner.os }}-20.04-pip-
|
||||
|
||||
- name: Get yarn cache directory path
|
||||
id: yarn-cache-dir-path
|
||||
|
@ -52,13 +52,13 @@ jobs:
|
|||
sudo apt-get install gettext
|
||||
|
||||
# for wxPython
|
||||
sudo apt install glib-networking libsdl1.2-dev
|
||||
sudo apt install glib-networking libsdl1.2-dev libsdl2-2.0-0
|
||||
|
||||
# for PyGObject
|
||||
sudo apt install libgirepository1.0-dev libcairo2-dev
|
||||
|
||||
# for shapely
|
||||
sudo apt install libgeos-dev build-essential libgtk-3-dev
|
||||
sudo apt install build-essential libgtk-3-dev
|
||||
|
||||
uname -a
|
||||
python --version
|
||||
|
@ -78,7 +78,7 @@ jobs:
|
|||
# scipy gives us a ELF error when stripped
|
||||
sudo apt-get install gcc g++ gfortran python3-dev libopenblas-dev liblapack-dev
|
||||
python -m pip uninstall --yes scipy
|
||||
python -m pip install scipy --no-binary scipy
|
||||
python -m pip install scipy==1.9.0 --no-binary scipy
|
||||
|
||||
echo "${{ env.pythonLocation }}\bin" >> $GITHUB_PATH
|
||||
- shell: bash
|
||||
|
|
|
@ -6,12 +6,14 @@
|
|||
-e git+https://gitlab.com/inkscape/extensions.git@e44fdcbe6bcc917ef3a2164eb0c130f7276fb83f#egg=inkex
|
||||
|
||||
backports.functools_lru_cache
|
||||
wxPython==4.1.1
|
||||
https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/wxPython-4.1.1-cp38-cp38-linux_x86_64.whl ; sys_platform == 'linux'
|
||||
wxPython==4.1.1 ; sys_platform == 'darwin'
|
||||
wxPython==4.1.1 ; sys_platform == 'win32'
|
||||
networkx
|
||||
shapely==1.8.2
|
||||
shapely
|
||||
lxml
|
||||
appdirs
|
||||
numpy<=1.17.4
|
||||
numpy
|
||||
jinja2>2.9
|
||||
requests
|
||||
colormath
|
||||
|
@ -22,5 +24,5 @@ fonttools
|
|||
trimesh
|
||||
scipy
|
||||
|
||||
pywinutils; sys.platform == 'win32'
|
||||
pywin32; sys.platform == 'win32'
|
||||
pywinutils ; sys_platform == 'win32'
|
||||
pywin32 ; sys_platform == 'win32'
|
||||
|
|
Ładowanie…
Reference in New Issue