chore: 1.x branch in prep of 2.0

hoffstadt · Sep 17, 2024 · 64c8fa7 · 64c8fa7
1 parent 6541ac7
commit 64c8fa7
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 36 deletions.
diff --git a/.github/workflows/Deployment.yml b/.github/workflows/Deployment.yml
@@ -8,9 +8,7 @@ on:
   workflow_dispatch:
 
     branches:
-      - master
-      - development
-      - development_*
+      - 1.x
 
     inputs:
 
@@ -41,7 +39,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
@@ -68,11 +66,11 @@ jobs:
         python -m setup bdist_wheel --plat-name win_amd64 --dist-dir dist
 
     - name: Upload Windows ${{ matrix.python-version }} Wheel
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: windowsbuild${{ matrix.python-version }}
         path: ${{ github.workspace }}/dist/*.whl
-        retention-days: 2
+        overwrite: true
 
   build-mac10-wheels:
 
@@ -84,7 +82,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
@@ -108,11 +106,11 @@ jobs:
         python -m setup bdist_wheel --plat-name macosx-10.6-x86_64 --dist-dir dist
 
     - name: Upload MacOS 10.15 ${{ matrix.python-version }} Wheel
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: apple10build${{ matrix.python-version }}
         path: ${{ github.workspace }}/dist/*.whl
-        retention-days: 2
+        overwrite: true
 
   build-mac-silicon-wheels:
 
@@ -124,7 +122,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
@@ -148,11 +146,11 @@ jobs:
           python -m setup bdist_wheel --plat-name macosx-13.0-arm64 --dist-dir dist
 
       - name: Upload MacOS ${{ matrix.python-version }} Wheel
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: apple10sbuild${{ matrix.python-version }}
           path: ${{ github.workspace }}/dist/*.whl
-          retention-days: 2
+          overwrite: true
 
   build-linux-wheels:
 
@@ -166,7 +164,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Setup Python ${{ matrix.python-version }}
       uses: actions/setup-python@v4
@@ -192,11 +190,11 @@ jobs:
         python -m setup bdist_wheel --plat-name manylinux1_x86_64 --dist-dir dist
 
     - name: Upload Linux ${{ matrix.python-version }} Wheel
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linuxbuild${{ matrix.python-version }}
         path: ${{ github.workspace }}/dist/*.whl
-        retention-days: 2
+        overwrite: true
 
   deploy-packages:
 
@@ -206,7 +204,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Python 3.9
       uses: actions/setup-python@v4
@@ -218,7 +216,7 @@ jobs:
         python -m pip install --upgrade pip setuptools wheel twine
 
     - name: Download artifacts
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
 
     - name: PyPi Deployment
       shell: cmd

diff --git a/.github/workflows/EmbeddedBuild.yml b/.github/workflows/EmbeddedBuild.yml
@@ -8,9 +8,7 @@ on:
   push:
 
     branches:
-      - master
-      - development
-      - development_*
+      - 1.x
 
     paths-ignore:
       - 'docs/**'
@@ -31,7 +29,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Retrieve submodules
       shell: cmd
@@ -70,7 +68,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Retrieve submodules
       run: git submodule update --init --recursive
@@ -105,7 +103,7 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Retrieve submodules
       run: git submodule update --init --recursive

diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -4,9 +4,7 @@ on:
   push:
 
     branches:
-      - master
-      - development
-      - development_*
+      - 1.x
 
     paths-ignore:
       - 'docs/**'
@@ -21,7 +19,7 @@ jobs:
     runs-on: ubuntu-20.04
     if: ${{! contains(github.event.head_commit.message, '[individual]') || contains(github.event.head_commit.message, '[static analysis]')}}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         #with:
         #  fetch-depth: 1
 
@@ -74,7 +72,7 @@ jobs:
 
       - name: Archive code coverage results
         if: ${{ always() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pvs-results
           path: /home/runner/work/DearPyGui/DearPyGui/pvs-studio.html
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Dear PyGui, LLC
+Copyright (c) 2024 Pilot Light, LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -15,9 +15,9 @@
 </p>
 
 <p align="center">
-   <a href="https://github.com/hoffstadt/DearPyGui/actions?workflow=Embedded%20Build"><img src="https://github.com/hoffstadt/DearPyGui/workflows/Embedded%20Build/badge.svg?branch=master" alt="static-analysis"></a>
-   <a href="https://github.com/hoffstadt/DearPyGui/actions?workflow=Static%20Analysis"><img src="https://github.com/hoffstadt/DearPyGui/workflows/Static%20Analysis/badge.svg?branch=master" alt="static-analysis"></a>
-   <a href="https://github.com/hoffstadt/DearPyGui/actions/workflows/Deployment.yml"><img src="https://github.com/hoffstadt/DearPyGui/actions/workflows/Deployment.yml/badge.svg?branch=master" alt="Deployment"></a>
+   <a href="https://github.com/hoffstadt/DearPyGui/actions?workflow=Embedded%20Build"><img src="https://github.com/hoffstadt/DearPyGui/workflows/Embedded%20Build/badge.svg?branch=1.x" alt="static-analysis"></a>
+   <a href="https://github.com/hoffstadt/DearPyGui/actions?workflow=Static%20Analysis"><img src="https://github.com/hoffstadt/DearPyGui/workflows/Static%20Analysis/badge.svg?branch=1.x" alt="static-analysis"></a>
+   <a href="https://github.com/hoffstadt/DearPyGui/actions/workflows/Deployment.yml"><img src="https://github.com/hoffstadt/DearPyGui/actions/workflows/Deployment.yml/badge.svg?branch=1.x" alt="Deployment"></a>
    <a href="https://dearpygui.readthedocs.io/en/latest/?badge=latest"><img src="https://readthedocs.org/projects/dearpygui/badge/?version=latest" alt="Documentation Status"></a>
 </p>
 
@@ -100,7 +100,7 @@ dpg.destroy_context()
 <p align="center"><a href="https://dearpygui.readthedocs.io/en/latest/tutorials/first-steps.html#first-run"><img src="https://raw.githubusercontent.com/hoffstadt/DearPyGui/assets/readme/first_app.gif" alt="Dear PyGui example window"></a></p>
                                                                                            
 ## Demo
-The built-in demo shows all of Dear PyGui's functionality. Use [this code](https://dearpygui.readthedocs.io/en/latest/tutorials/first-steps.html#demo) to run the demo. The following impression shows a few, but not nearly all, of the available widgets and features. Since the Python code of the demo can be <a href="https://github.com/hoffstadt/DearPyGui/blob/master/dearpygui/demo.py" alt="demo code repository">inspected</a>, you can leverage the demo code to build your own apps.
+The built-in demo shows all of Dear PyGui's functionality. Use [this code](https://dearpygui.readthedocs.io/en/latest/tutorials/first-steps.html#demo) to run the demo. The following impression shows a few, but not nearly all, of the available widgets and features. Since the Python code of the demo can be <a href="https://github.com/hoffstadt/DearPyGui/blob/1.x/dearpygui/demo.py" alt="demo code repository">inspected</a>, you can leverage the demo code to build your own apps.
 <br/><br/>
 <p align="center"><a href="https://dearpygui.readthedocs.io/en/latest/tutorials/first-steps.html#demo"><img src="https://raw.githubusercontent.com/hoffstadt/DearPyGui/assets/readme/demo.gif" alt="Dear PyGui demo"></a></p>
 
@@ -147,7 +147,7 @@ Dear PyGui is built on top of <a href="https://github.com/ocornut/imgui" target=
 - [Johann Muszynski](https://github.com/Nelarius) for all of his work on [imnodes](https://github.com/Nelarius/imnodes).
 
 ## License
-Dear PyGui is licensed under the [MIT License](https://github.com/hoffstadt/DearPyGui/blob/master/LICENSE).
+Dear PyGui is licensed under the [MIT License](https://github.com/hoffstadt/DearPyGui/blob/1.x/LICENSE).
 
 ## Sponsor
 Continued maintenance and development are a full-time endeavor which we would like to sustain and grow. Ongoing development is financially supported by users and private sponsors. If you enjoy Dear PyGui please consider becoming a [sponsor](https://github.com/hoffstadt/DearPyGui/wiki/Sponsors) or buy us a [cup of coffee](https://www.buymeacoffee.com/DearPyGui).

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 import shutil
 import subprocess
 
-wip_version = "1.11.1"
+wip_version = "1.12.0"
 
 def version_number():
     """This function reads the version number which is populated by github actions"""
@@ -169,7 +169,7 @@ def setup_package():
         long_description_content_type='text/markdown',         # Optional
         url='https://github.com/hoffstadt/DearPyGui',          # Optional
         license = 'MIT',
-        python_requires='>=3.7',
+        python_requires='>=3.8',
         classifiers=[
                 'Development Status :: 5 - Production/Stable',
                 'Intended Audience :: Education',