- updated the make_freezed.py file to make sure that all the required files are included

- updated the setup_ubuntu.sh to include the sudo command (courtesy of Krishna Torque on bitbucket)
This commit is contained in:
Marius Stanciu 2019-11-17 15:58:58 +02:00 committed by Marius
parent d327160ab9
commit b41ecd87f8
4 changed files with 13 additions and 39 deletions

View File

@ -13,6 +13,8 @@ CAD program, and create G-Code for Isolation routing.
- optimized the storage of the Gerber mark shapes by making them one layer only
- optimized the Distance Tool such that the distance utility geometry will be shown even when the mark shapes are plotted.
- updated the make_freezed.py file to make sure that all the required files are included
- updated the setup_ubuntu.sh to include the sudo command (courtesy of Krishna Torque on bitbucket)
16.11.2019

View File

@ -1160,7 +1160,7 @@ class RulesCheck(FlatCAMTool):
return
# RULE: Check Copper to Outline Clearance
if self.clearance_copper2ol_cb.get_value():
if self.clearance_copper2ol_cb.get_value() and self.out_cb.get_value():
top_dict = dict()
bottom_dict = dict()
outline_dict = dict()

View File

@ -74,8 +74,7 @@ if platform.architecture()[0] == '64bit':
excludes=['scipy','pytz'],
# packages=['OpenGL','numpy','vispy','ortools','google']
# packages=['numpy','google', 'rasterio'] # works for Python 3.7
packages = ['opengl', 'numpy', 'google', 'rasterio'] # works for Python 3.6.5 and Python 3.7.1
packages=['opengl', 'numpy', 'google', 'rasterio'], # works for Python 3.6.5 and Python 3.7.1
)
else:
buildOptions = dict(
@ -83,10 +82,12 @@ else:
excludes=['scipy', 'pytz'],
# packages=['OpenGL','numpy','vispy','ortools','google']
# packages=['numpy', 'rasterio'] # works for Python 3.7
packages = ['opengl', 'numpy', 'rasterio'] # works for Python 3.6.5 and Python 3.7.1
packages=['opengl', 'numpy', 'rasterio'], # works for Python 3.6.5 and Python 3.7.1
)
if sys.platform == "win32":
buildOptions["include_msvcr"] = True
print("INCLUDE_FILES", include_files)

View File

@ -1,34 +1,5 @@
#!/bin/sh
apt-get install python3-pip
apt-get install python3-pyqt5
apt-get install python3-pyqt5.qtopengl
apt-get install libpng-dev
apt-get install libfreetype6 libfreetype6-dev
apt-get install python3-dev
apt-get install python3-simplejson
apt-get install python3-numpy python3-scipy
apt-get install libgeos-dev
apt-get install python3-shapely
apt-get install python3-rtree
apt-get install python3-tk
apt-get install libspatialindex-dev
apt-get install python3-gdal
apt-get install python3-lxml
pip3 install --upgrade cycler
pip3 install --upgrade python-dateutil
pip3 install --upgrade kiwisolver
pip3 install --upgrade dill
pip3 install --upgrade Shapely
pip3 install --upgrade vispy
pip3 install --upgrade rtree
pip3 install --upgrade pyopengl
pip3 install --upgrade setuptools
pip3 install --upgrade svg.path
pip3 install --upgrade ortools
pip3 install --upgrade freetype-py
pip3 install --upgrade fontTools
pip3 install --upgrade rasterio
pip3 install --upgrade lxml
pip3 install --upgrade ezdxf
pip3 install --upgrade matplotlib
pip3 install --upgrade qrcode
#!/bin/bash
sudo apt install --reinstall libpng-dev libfreetype6 libfreetype6-dev libgeos-dev libspatialindex-dev
sudo apt install --reinstall python3-dev python3-pyqt5 python3-pyqt5.qtopengl python3-gdal python3-simplejson python3-pip python3-tk
sudo python3 -m pip install --upgrade pip numpy scipy shapely rtree tk lxml cycler python-dateutil kiwisolver dill vispy pyopengl setuptools svg.path ortools freetype-py fontTools rasterio ezdxf matplotlib qrcode