Skip to content

Commit

Permalink
Compiled app on macOS and Windows 7
Browse files Browse the repository at this point in the history
    + Updated links in documentation
    + Added path for pyqtgraph icons in make.py
    + Fixed requirements in setup.py
  • Loading branch information
doizuc committed Jul 19, 2021
1 parent 040316d commit fe7d443
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
7 changes: 6 additions & 1 deletion docs/quick_start.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,19 @@ Quick Start

-windows.zip">Windows</a>

.. |end-link-win7| raw:: html

-windows7.zip">Windows 7</a>

.. |end-link-mac| raw:: html

-darwin.zip">macOS</a>

Inlinino is available for Windows and macOS, the packaged executable can be downloaded with the links below. Windows users will have to unzip the archive.

+ |link-to-ftp|\ |release|\ |end-link-win|
+ `macOS Catalina <http://misclab.umeoce.maine.edu/software/Inlinino/Inlinino-v2.4.3-catalina.zip>`__
+ |link-to-ftp|\ |release|\ |end-link-win7|
+ |link-to-ftp|\ |release|\ |end-link-mac|

Advance users or developers can setup the software directly from source (`GitHub Repository <https://github.com/OceanOptics/Inlinino/>`__).

Expand Down
3 changes: 2 additions & 1 deletion make.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
OS_OPERATOR = ';'
ICON_EXT = 'ico'
DIST_PATH = 'dist_windows'
PATH_TO_PYQTGRAPH_ICONS = r'C:\Users\nils\AppData\Local\Programs\Python\Python38\Lib\site-packages\pyqtgraph\icons'
PATH_TO_PYQTGRAPH_ICONS = r'C:\Users\nils\AppData\Local\Programs\Python\Python38\Lib\site-packages\pyqtgraph\icons' # Windows 10
# PATH_TO_PYQTGRAPH_ICONS = r'C:\Program Files\Python38\Lib\site-packages\pyqtgraph\icons' # Windows 7
elif platform.system() == 'Darwin':
# macOS
OS_OPERATOR = ':'
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
long_description_content_type="text/markdown",
url="https://github.com/OceanOptics/Inlinino",
packages=setuptools.find_packages(),
install_requires=['pyserial>=3.4', 'numpy', 'pyACS', 'PyQt5=5.15', 'pyqtgraph>=0.12.1'],
install_requires=['pyserial>=3.4', 'numpy', 'pyACS', 'PyQt5==5.15', 'pyqtgraph>=0.12.1', 'pynmea'],
python_requires='3.8',
license='GPLv3',
classifiers=[
Expand Down

0 comments on commit fe7d443

Please sign in to comment.