Skip to content

Commit

Permalink
0.15.0 - Windows x64 Binaries
Browse files Browse the repository at this point in the history
  • Loading branch information
andrew-shc committed Apr 26, 2020
1 parent 590f5b5 commit 15cac66
Show file tree
Hide file tree
Showing 21 changed files with 309 additions and 245 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ __pycache__/
# project internal
old/
proto/

# project builds
build/
dist/
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
## 0.15.0 [April 23, 2020] (LICENSE CHANGE)
* **LICENSE CHANGED**
* Changed from Apache v2.0 to GPL v3.0 because of PyQt5 and PyInstaller.
* And since its an end-user product, I believe this is a suitable license to support open-source software
* This will be **permanent**
* (Did attempted to use fbs and PyInstaller and cx_Freeze)
* Distribution is here!
* Using PyInstaller (developer version because of some hidden imports shenanigans)
* Access distribution via <https://andrews236.github.io/>


## Indev 14.1 [April 22, 2020]
* Serialization now is able to serialize constant field datas
* New Optional Type (The last type we will implement for now)
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ This project is built on Python 3.7 using PyQt5 for the front-end and
Scikit-Learn for the model back-ends.

### Requirements
* Python 3.7 Interpreter
* Libraries Required
* PyQt5
* SkLearn (Scikit-Learn)
##### Windows
* Access single executables via <https://andrews236.github.io/>

##### MacOS / Linux / etc.
* Python 3.7 (x64) Interpreter; cannot be x86
* Libraries Required via requirements.txt
* Preferably use virtual-environment to execute your project

### Updates
Expand Down
5 changes: 4 additions & 1 deletion TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ Things can try. __(At your own risk!)__
- Add a pre-process normalize image node
- Add read image node
- Ask to save the project (if not saved) after the user decides to quit
- Don't save model if the user hadnt click [save model]
- Don't save model to the `project.yaml` if the user hadnt click [save model]
- When adding new model, instead of always locating at the same position, choose diff. pos.
- Add a tree to organize the nodes that is starting to get a lot
- Add zooming and panning for bigger nodes

#### Near Future (Ordered)
- A better way to create nodes
Expand Down
9 changes: 0 additions & 9 deletions graph/axis.frag

This file was deleted.

5 changes: 0 additions & 5 deletions graph/axis.vert

This file was deleted.

180 changes: 0 additions & 180 deletions graph/main.py

This file was deleted.

23 changes: 0 additions & 23 deletions graph/model.vert

This file was deleted.

9 changes: 0 additions & 9 deletions graph/triangle.frag

This file was deleted.

37 changes: 37 additions & 0 deletions graphical_ai.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# -*- mode: python ; coding: utf-8 -*-

block_cipher = None


a = Analysis(['src\\main.py'],
pathex=['C:\\Users\\Andrew Shen\\Desktop\\GraphicalAI'],
binaries=[('.venv/Lib/site-packages/sklearn/.libs', '.'), ('.venv/Lib/site-packages/sklearn', './sklearn')],
datas=[('src', '.')],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher,
noarchive=False)
pyz = PYZ(a.pure, a.zipped_data,
cipher=block_cipher)
exe = EXE(pyz,
a.scripts,
[],
exclude_binaries=True,
name='graphical_ai',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
console=True )
coll = COLLECT(exe,
a.binaries,
a.zipfiles,
a.datas,
strip=False,
upx=True,
upx_exclude=[],
name='graphical_ai')
37 changes: 37 additions & 0 deletions main.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# -*- mode: python ; coding: utf-8 -*-

block_cipher = None


a = Analysis(['src\\main.py'],
pathex=['C:\\Users\\Andrew Shen\\Desktop\\GraphicalAI'],
binaries=[],
datas=[],
hiddenimports=[],
hookspath=[],
runtime_hooks=[],
excludes=[],
win_no_prefer_redirects=False,
win_private_assemblies=False,
cipher=block_cipher,
noarchive=False)
pyz = PYZ(a.pure, a.zipped_data,
cipher=block_cipher)
exe = EXE(pyz,
a.scripts,
[],
exclude_binaries=True,
name='main',
debug=False,
bootloader_ignore_signals=False,
strip=False,
upx=True,
console=True )
coll = COLLECT(exe,
a.binaries,
a.zipfiles,
a.datas,
strip=False,
upx=True,
upx_exclude=[],
name='main')
5 changes: 5 additions & 0 deletions pyinstaller_compile.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pyinstaller --onedir --name="graphical_ai" src/main.py^
--add-binary=".venv/Lib/site-packages/sklearn/.libs;."^
--add-binary=".venv/Lib/site-packages/sklearn;./sklearn"^
--add-data="src;."

Loading

0 comments on commit 15cac66

Please sign in to comment.