Bladeren bron

- updated requirements.txt and setup_ubuntu.sh files

Marius Stanciu 6 jaren geleden
bovenliggende
commit
c7fafe0b87
4 gewijzigde bestanden met toevoegingen van 8 en 5 verwijderingen
  1. 1 0
      README.md
  2. 1 1
      flatcamTools/ToolFiducials.py
  3. 1 2
      requirements.txt
  4. 5 2
      setup_ubuntu.sh

+ 1 - 0
README.md

@@ -15,6 +15,7 @@ CAD program, and create G-Code for Isolation routing.
 - Tool Fiducials - added choice of shapes: circular or non-standard cross
 - Tool Fiducials - finished the work on adding soldermask openings
 - Tool Fiducials - finished the tool
+- updated requirements.txt and setup_ubuntu.sh files
 
 20.11.2019
 

+ 1 - 1
flatcamTools/ToolFiducials.py

@@ -1,7 +1,7 @@
 # ##########################################################
 # FlatCAM: 2D Post-processing for Manufacturing            #
 # File Author: Marius Adrian Stanciu (c)                   #
-# Date: 10/25/2019                                          #
+# Date: 11/21/2019                                         #
 # MIT Licence                                              #
 # ##########################################################
 

+ 1 - 2
requirements.txt

@@ -1,6 +1,6 @@
 # This file contains python only requirements to be installed with pip
 # Python packages that cannot be installed with pip (e.g. PyQt5, GDAL) are not included.
-# Usage: pip install -r requirements.txt
+# Usage: pip3 install -r requirements.txt
 numpy>=1.16
 matplotlib>=3.1
 cycler>=0.10
@@ -11,7 +11,6 @@ setuptools
 dill
 rtree
 pyopengl
-pyopengl-accelerate
 vispy
 ortools
 svg.path

+ 5 - 2
setup_ubuntu.sh

@@ -1,5 +1,8 @@
 #!/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 apt install --reinstall python3-dev python3-pyqt5 python3-pyqt5.qtopengl python3-gdal python3-simplejson
+sudo apt install --reinstall 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
+sudo python3 -m pip install --upgrade pip numpy scipy shapely rtree tk lxml cycler python-dateutil kiwisolver dill
+sudo python3 -m pip install --upgrade vispy pyopengl setuptools svg.path ortools freetype-py fontTools rasterio ezdxf
+sudo python3 -m pip install --upgrade matplotlib qrcode