Development setup (#1204)

* update setup.py * [skip ci] fix setup * [skip ci] update package_dir * added macos-11 * [skip ci] upgraded setup.py
hoffstadt · Aug 26, 2021 · 33d688a · 33d688a
1 parent b8b0411
commit 33d688a
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 89 deletions.
diff --git a/.github/workflows/Deployment.yml b/.github/workflows/Deployment.yml
@@ -55,24 +55,19 @@ jobs:
         git submodule update --init --recursive ./Dependencies/freetype
         git submodule update --init --recursive ./Dependencies/ImGuiFileDialog
       
-    - name: Build Dear PyGui
+    - name: Mark Versions
       shell: cmd
       run: |
         cd %GITHUB_WORKSPACE%
-        mkdir cmake-build-release
-        cd cmake-build-Release
-        cmake .. -G "Visual Studio 16 2019" -A "x64" -DMVDIST_ONLY=True -DMVDPG_VERSION=${{ github.event.inputs.version }}
-        cd ..
-        cmake --build cmake-build-release --config Release
+        echo ${{ github.event.inputs.version }} > version_number.txt
+        echo cmake-build-local/DearPyGui/Release/_dearpygui.pyd > lib_location.txt
 
     - name: Build Wheel
       shell: cmd
       run: |
         cd %GITHUB_WORKSPACE%
-        echo ${{ github.event.inputs.version }} > version_number.txt
-        echo cmake-build-release/DearPyGui/Release/_dearpygui.pyd > lib_location.txt
         python -m pip install --upgrade pip twine wheel
-        python -m setup bdist_wheel --plat-name win_amd64 --dist-dir dist
+        python -m setup bdist_wheel --dist-dir dist
     
     - name: Upload Windows ${{ matrix.python-version }} Wheel
       uses: actions/upload-artifact@v2
@@ -81,9 +76,9 @@ jobs:
         path: ${{ github.workspace }}/dist/*.whl
         retention-days: 2
 
-  build-mac-wheels:
+  build-mac10-wheels:
 
-    runs-on: MacOS-latest
+    runs-on: macos-10.15
     strategy:
       matrix:
         python-version: [ 3.6, 3.7, 3.8, 3.9 ]
@@ -105,27 +100,22 @@ jobs:
         git submodule update --init --recursive ./Dependencies/ImGuiFileDialog
         git submodule update --init --recursive ./Dependencies/glfw
     
-    - name: Build Dear PyGui
+    - name: Mark Versions
       run: |
         cd $GITHUB_WORKSPACE
-        mkdir cmake-build-release
-        cd cmake-build-release
-        cmake .. -DMVDIST_ONLY=True -DMVDPG_VERSION=${{ github.event.inputs.version }}
-        cd ..
-        cmake --build cmake-build-release --config Release
+        echo ${{ github.event.inputs.version }} > version_number.txt
+        echo cmake-build-local/DearPyGui/_dearpygui.so > lib_location.txt
 
     - name: Build Wheel
       run: |
         cd $GITHUB_WORKSPACE
-        echo ${{ github.event.inputs.version }} > version_number.txt
-        echo cmake-build-release/DearPyGui/_dearpygui.so > lib_location.txt
         python -m pip install --upgrade pip twine wheel
         python -m setup bdist_wheel --plat-name macosx-10.6-x86_64 --dist-dir dist
    
-    - name: Upload MacOS ${{ matrix.python-version }} Wheel
+    - name: Upload MacOS 10.15 ${{ matrix.python-version }} Wheel
       uses: actions/upload-artifact@v2
       with:
-        name: applebuild${{ matrix.python-version }}
+        name: apple10build${{ matrix.python-version }}
         path: ${{ github.workspace }}/dist/*.whl
         retention-days: 2
 
@@ -157,20 +147,15 @@ jobs:
         sudo apt-get install libfreetype6-dev -y
         sudo apt-get install libharfbuzz-dev -y
     
-    - name: Build
+    - name: Mark Versions
       run: |
         cd $GITHUB_WORKSPACE
-        mkdir cmake-build-release
-        cd cmake-build-release
-        cmake .. -DMVDIST_ONLY=True -DMVDPG_VERSION=${{ github.event.inputs.version }}
-        cd ..
-        cmake --build cmake-build-release --config Release
+        echo ${{ github.event.inputs.version }} > version_number.txt
+        echo cmake-build-local/DearPyGui/_dearpygui.so > lib_location.txt
 
     - name: Build Wheel
       run: |
         cd $GITHUB_WORKSPACE
-        echo ${{ github.event.inputs.version }} > version_number.txt
-        echo cmake-build-release/DearPyGui/_dearpygui.so > lib_location.txt
         python -m pip install --upgrade pip twine wheel
         python -m setup bdist_wheel --plat-name manylinux1_x86_64 --dist-dir dist
 
@@ -183,7 +168,7 @@ jobs:
 
   deploy-packages:
 
-    needs: [build-windows-wheels, build-mac-wheels, build-linux-wheels]
+    needs: [build-windows-wheels, build-mac10-wheels, build-linux-wheels]
     runs-on: windows-2019
 
     steps:
@@ -208,7 +193,7 @@ jobs:
       if: ${{contains(github.event.inputs.deploy, 'true') && github.ref == 'refs/heads/master'}}
       run: |
         python -m twine upload windowsbuild*/* -u __token__ -p ${{ secrets.PYPI_PASSWORD }} --skip-existing
-        python -m twine upload applebuild*/* -u __token__ -p ${{ secrets.PYPI_PASSWORD }} --skip-existing
+        python -m twine upload apple10build*/* -u __token__ -p ${{ secrets.PYPI_PASSWORD }} --skip-existing
         python -m twine upload linuxbuild*/* -u __token__ -p ${{ secrets.PYPI_PASSWORD }} --skip-existing
 
     - name: Test PyPi Deployment
@@ -217,5 +202,5 @@ jobs:
       run: |
         dir
         python -m twine upload --repository testpypi windowsbuild*/* -u __token__ -p ${{ secrets.TEST_PYPI_PASSWORD }} --skip-existing
-        python -m twine upload --repository testpypi applebuild*/* -u __token__ -p ${{ secrets.TEST_PYPI_PASSWORD }} --skip-existing
+        python -m twine upload --repository testpypi apple10build*/* -u __token__ -p ${{ secrets.TEST_PYPI_PASSWORD }} --skip-existing
         python -m twine upload --repository testpypi linuxbuild*/* -u __token__ -p ${{ secrets.TEST_PYPI_PASSWORD }} --skip-existing
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -2,6 +2,18 @@ name: Static Analysis
 
 on:
   push:
+
+    branches:
+      - master
+      - development
+      - development_*
+
+    paths-ignore:
+      - 'docs/**'
+      - 'Resources/**'
+      - 'Scripts/**'
+      - 'Tools/**'
+
   pull_request:
   workflow_dispatch:
 

diff --git a/.gitignore b/.gitignore
@@ -4,7 +4,7 @@ out/
 cmake-build-debug/
 cmake-build-release/
 cmake-build-local/
-Output/
+output/
 dist/
 .DS_Store
 __pycache__/

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,9 +41,6 @@ if(MV_TESTS_ONLY)
     add_definitions(-DMV_TESTS_ONLY)
 endif()
 
-# version number of Dear PyGui, usually set
-set(MVDPG_VERSION ${MVDPG_VERSION})
-
 add_subdirectory("Dependencies")
 
 # if this is not a distribution build

diff --git a/DearPyGui/cmake/distribution.cmake b/DearPyGui/cmake/distribution.cmake
@@ -11,8 +11,8 @@ target_sources(_dearpygui PRIVATE ${MARVEL_SOURCES})
 
 target_include_directories(_dearpygui 
 		PRIVATE 
-			${MARVEL_INCLUDE_DIR}
 			${Python_INCLUDE_DIRS}
+			${MARVEL_INCLUDE_DIR}
 	)
 
 target_link_directories(_dearpygui 

diff --git a/DearPyGui/dearpygui/_deprecated.py b/DearPyGui/dearpygui/_deprecated.py
@@ -42,12 +42,10 @@ def new_func2(*args, **kwargs):
 
 		return new_func2
 
-
 @deprecated("Use 'configure_app(docking=True, docking_space=dock_space)'.")
 def enable_docking(dock_space: bool = False) -> None:
     internal_dpg.configure_app(docking=True, docking_space=dock_space)
 
-
 @deprecated("Use 'get_app_configuration()['version']'.")
 def get_dearpygui_version() -> str:
     return internal_dpg.get_app_configuration()["version"]

diff --git a/docs/README.md → README.md b/docs/README.md → README.md
@@ -6,7 +6,7 @@
 
 </a>
 
-<h6 align="center">(This library is available under a free and permissive license however, if you Enjoy <i>Dear PyGui</i> please consider becoming a <a href="https://github.com/hoffstadt/DearPyGui/wiki/Sponsors">Sponsor</a>)</h6>
+<h6 align="center">(This library is available under a free and permissive license however, if you enjoy using <i>Dear PyGui</i> please consider becoming a <a href="https://github.com/hoffstadt/DearPyGui/wiki/Sponsors">Sponsor</a>)</h6>
 
 ![Python Version](https://img.shields.io/pypi/pyversions/dearpygui)
 [![PYPI](https://img.shields.io/pypi/v/dearpygui)](https://pypi.org/project/dearpygui/)
@@ -25,10 +25,10 @@
 uses the immediate mode paradigm and your computer's GPU to facilitate extremely dynamic interfaces. _Dear PyGui_ is currently supported on
 the following platforms:
 
-| Platform | Rendering API | Newest Version |
+| Platform | Graphics API | Newest Version |
 |----------|---------------|----------------|
 | **Windows 10** | _DirectX 11_ | [![PYPI](https://img.shields.io/pypi/v/dearpygui)](https://pypi.org/project/dearpygui/) |
-| **macOs** | _Metal_ | [![PYPI](https://img.shields.io/pypi/v/dearpygui)](https://pypi.org/project/dearpygui/) |
+| **macOS** | _Metal_ | [![PYPI](https://img.shields.io/pypi/v/dearpygui)](https://pypi.org/project/dearpygui/) |
 | **Linux** | _OpenGL 3_ | [![PYPI](https://img.shields.io/pypi/v/dearpygui)](https://pypi.org/project/dearpygui/) |
 | **Raspberry Pi 4** | _OpenGL ES_ | [![PYPI](https://img.shields.io/badge/pypi-v0.8.64-orange)](https://img.shields.io/badge/pypi-v0.8.64-orange) |
 

diff --git a/Scripts/BuildLocalWheelForWindows.bat b/Scripts/BuildLocalWheelForWindows.bat