- update the language template strings.pot and updated the Romanian translation

- updated the Readme file with the steps for installation for MacOS
- updated the requirements.txt file

CHANGELOG.md

@@ -16,6 +16,9 @@ CHANGELOG for FlatCAM beta
 - some message strings cleanup
 - added possibility to save as text file the content in Tcl Shell browser window when clicking the Save log context menu entry
 - fixed an issue regarding the statusbar pixmap selection
+- update the language template strings.pot and updated the Romanian translation
+- updated the Readme file with the steps for installation for MacOS
+- updated the requirements.txt file
 
 23.04.2020 
 

README.md

@@ -20,21 +20,7 @@ Menu -> Help -> About FlatCAM -> Programmers -> Marius Stanciu
 - Download sources from: https://bitbucket.org/jpcgt/flatcam/downloads/
 - Unzip them on a HDD location that your user has permissions for.
 
-1. MacOS
-- none (yet)
-
-2. Linux
-- make sure that Python 3.8 is installed on your OS and that the command: python3 -V confirm it
-- verify that the pip package is installed for your Python installation (e.g 3.8) by running the command pip3 -V. 
-If it is not installed, install it. In Ubuntu-like OS's it is done like this: 
-sudo apt-get install python3-pip 
-or:
-sudo apt-get install python3.8-pip
-- verify that the file setup_ubuntu.sh has Linux line-endings (LF) and that it is executable (chmod +x setup_ubuntu.sh)
-- run the file setup_ubuntu.sh and install all the dependencies with the command: ./setup_ubuntu.sh
-- if the previous command is successful and has no errors, run FlatCAM with the command: python3 FlatCAM.py
-
-3. Windows
+1. Windows
 - download the provided installer (for your OS flavor 64bit or 32bit) from:
 https://bitbucket.org/jpcgt/flatcam/downloads/
 - execute the installer and install the program. It is recommended to install as a Local User.
@@ -63,3 +49,39 @@ D:\my_folder\> pip install --upgrade package_from_requirements.whl
 Run FlatCAM beta from the installation folder (e.g D:\FlatCAM_beta) in the Command Prompt with the following command:
 cd D:\FlatCAM_beta
 python FlatCAM.py
+
+2. Linux
+- make sure that Python 3.8 is installed on your OS and that the command: python3 -V confirm it
+- verify that the pip package is installed for your Python installation (e.g 3.8) by running the command pip3 -V. 
+If it is not installed, install it. In Ubuntu-like OS's it is done like this: 
+sudo apt-get install python3-pip 
+or:
+sudo apt-get install python3.8-pip
+- verify that the file setup_ubuntu.sh has Linux line-endings (LF) and that it is executable (chmod +x setup_ubuntu.sh)
+- run the file setup_ubuntu.sh and install all the dependencies with the command: ./setup_ubuntu.sh
+- if the previous command is successful and has no errors, run FlatCAM with the command: python3 FlatCAM.py
+
+3. MacOS
+Instructions from here: https://gist.github.com/natevw/3e6fc929aff358b38c0a#gistcomment-3111878
+
+- create a folder to hold the sources somewhere on your HDD:
+mkdir FlatCAM
+
+- unzip in this folder the sources downloaded from https://bitbucket.org/jpcgt/flatcam/downloads/
+Using commands (e.g using the sources for FlatCAM beta 8.991):
+cd ~/FlatCAM
+wget https://bitbucket.org/jpcgt/flatcam/downloads/FlatCAM_beta_8.991_sources.zip
+unzip FlatCAM_beta_8.991_sources.zip
+cd FlatCAM_beta_8.991_sources
+
+- check if Homebrew is installed:
+xcode-select --install
+ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
+- install dependencies:
+brew install pyqt
+python3 -m ensurepip
+python3 -m pip install -r requirements.txt
+
+- run FlatCAM
+python3 FlatCAM.py

requirements.txt

@@ -1,6 +1,8 @@
 # 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.
+# For Windows GDAL wheel can be found here: https://www.lfd.uci.edu/~gohlke/pythonlibs/#gdal
 # Usage: pip3 install -r requirements.txt
+
 pyqt5>=5.12.1
 numpy>=1.16
 matplotlib>=3.1
@@ -13,7 +15,7 @@ dill
 rtree
 pyopengl
 vispy
-ortools
+ortools>=7.0
 svg.path
 simplejson
 shapely>=1.3
@@ -24,4 +26,5 @@ lxml
 ezdxf
 qrcode>=6.1
 reportlab>=3.5
-svglib
+svglib
+gdal