diff --git a/.ci/update_windows/update.py b/.ci/update_windows/update.py deleted file mode 100755 index 001a58ebf..000000000 --- a/.ci/update_windows/update.py +++ /dev/null @@ -1,146 +0,0 @@ -import pygit2 -from datetime import datetime -import sys -import os -import shutil -import filecmp - -def pull(repo, remote_name='origin', branch='master'): - for remote in repo.remotes: - if remote.name == remote_name: - remote.fetch() - remote_master_id = repo.lookup_reference('refs/remotes/origin/%s' % (branch)).target - merge_result, _ = repo.merge_analysis(remote_master_id) - # Up to date, do nothing - if merge_result & pygit2.GIT_MERGE_ANALYSIS_UP_TO_DATE: - return - # We can just fastforward - elif merge_result & pygit2.GIT_MERGE_ANALYSIS_FASTFORWARD: - repo.checkout_tree(repo.get(remote_master_id)) - try: - master_ref = repo.lookup_reference('refs/heads/%s' % (branch)) - master_ref.set_target(remote_master_id) - except KeyError: - repo.create_branch(branch, repo.get(remote_master_id)) - repo.head.set_target(remote_master_id) - elif merge_result & pygit2.GIT_MERGE_ANALYSIS_NORMAL: - repo.merge(remote_master_id) - - if repo.index.conflicts is not None: - for conflict in repo.index.conflicts: - print('Conflicts found in:', conflict[0].path) - raise AssertionError('Conflicts, ahhhhh!!') - - user = repo.default_signature - tree = repo.index.write_tree() - commit = repo.create_commit('HEAD', - user, - user, - 'Merge!', - tree, - [repo.head.target, remote_master_id]) - # We need to do this or git CLI will think we are still merging. - repo.state_cleanup() - else: - raise AssertionError('Unknown merge analysis result') - -pygit2.option(pygit2.GIT_OPT_SET_OWNER_VALIDATION, 0) -repo_path = str(sys.argv[1]) -repo = pygit2.Repository(repo_path) -ident = pygit2.Signature('comfyui', 'comfy@ui') -try: - print("stashing current changes") - repo.stash(ident) -except KeyError: - print("nothing to stash") -backup_branch_name = 'backup_branch_{}'.format(datetime.today().strftime('%Y-%m-%d_%H_%M_%S')) -print("creating backup branch: {}".format(backup_branch_name)) -try: - repo.branches.local.create(backup_branch_name, repo.head.peel()) -except: - pass - -print("checking out master branch") -branch = repo.lookup_branch('master') -if branch is None: - ref = repo.lookup_reference('refs/remotes/origin/master') - repo.checkout(ref) - branch = repo.lookup_branch('master') - if branch is None: - repo.create_branch('master', repo.get(ref.target)) -else: - ref = repo.lookup_reference(branch.name) - repo.checkout(ref) - -print("pulling latest changes") -pull(repo) - -if "--stable" in sys.argv: - def latest_tag(repo): - versions = [] - for k in repo.references: - try: - prefix = "refs/tags/v" - if k.startswith(prefix): - version = list(map(int, k[len(prefix):].split("."))) - versions.append((version[0] * 10000000000 + version[1] * 100000 + version[2], k)) - except: - pass - versions.sort() - if len(versions) > 0: - return versions[-1][1] - return None - latest_tag = latest_tag(repo) - if latest_tag is not None: - repo.checkout(latest_tag) - -print("Done!") - -self_update = True -if len(sys.argv) > 2: - self_update = '--skip_self_update' not in sys.argv - -update_py_path = os.path.realpath(__file__) -repo_update_py_path = os.path.join(repo_path, ".ci/update_windows/update.py") - -cur_path = os.path.dirname(update_py_path) - - -req_path = os.path.join(cur_path, "current_requirements.txt") -repo_req_path = os.path.join(repo_path, "requirements.txt") - - -def files_equal(file1, file2): - try: - return filecmp.cmp(file1, file2, shallow=False) - except: - return False - -def file_size(f): - try: - return os.path.getsize(f) - except: - return 0 - - -if self_update and not files_equal(update_py_path, repo_update_py_path) and file_size(repo_update_py_path) > 10: - shutil.copy(repo_update_py_path, os.path.join(cur_path, "update_new.py")) - exit() - -if not os.path.exists(req_path) or not files_equal(repo_req_path, req_path): - import subprocess - try: - subprocess.check_call([sys.executable, '-s', '-m', 'pip', 'install', '-r', repo_req_path]) - shutil.copy(repo_req_path, req_path) - except: - pass - - -stable_update_script = os.path.join(repo_path, ".ci/update_windows/update_comfyui_stable.bat") -stable_update_script_to = os.path.join(cur_path, "update_comfyui_stable.bat") - -try: - if not file_size(stable_update_script_to) > 10: - shutil.copy(stable_update_script, stable_update_script_to) -except: - pass diff --git a/.ci/update_windows/update_comfyui_stable.bat b/.ci/update_windows/update_comfyui_stable.bat deleted file mode 100755 index e18010da3..000000000 --- a/.ci/update_windows/update_comfyui_stable.bat +++ /dev/null @@ -1,8 +0,0 @@ -@echo off -..\python_embeded\python.exe .\update.py ..\ComfyUI\ --stable -if exist update_new.py ( - move /y update_new.py update.py - echo Running updater again since it got updated. - ..\python_embeded\python.exe .\update.py ..\ComfyUI\ --skip_self_update --stable -) -if "%~1"=="" pause diff --git a/.github/workflows/test-launch.yml b/.github/workflows/test-launch.yml deleted file mode 100644 index 42f1dbe99..000000000 --- a/.github/workflows/test-launch.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: Test server launches without errors - -on: - push: - branches: [ main, master ] - pull_request: - branches: [ main, master ] - -jobs: - test: - runs-on: ubuntu-latest - steps: - - name: Checkout ComfyUI - uses: actions/checkout@v4 - with: - repository: "comfyanonymous/ComfyUI" - path: "ComfyUI" - - uses: actions/setup-python@v4 - with: - python-version: '3.8' - - name: Install requirements - run: | - python -m pip install --upgrade pip - pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu - pip install -r requirements.txt - pip install wait-for-it - working-directory: ComfyUI - - name: Start ComfyUI server - run: | - python main.py --cpu 2>&1 | tee console_output.log & - wait-for-it --service 127.0.0.1:8188 -t 600 - working-directory: ComfyUI - - name: Check for unhandled exceptions in server log - run: | - if grep -qE "Exception|Error" console_output.log; then - echo "Unhandled exception/error found in server log." - exit 1 - fi - working-directory: ComfyUI - - uses: actions/upload-artifact@v4 - if: always() - with: - name: console-output - path: ComfyUI/console_output.log - retention-days: 30 diff --git a/.github/workflows/test-ui.yaml b/.github/workflows/test-ui.yaml deleted file mode 100644 index cced6de65..000000000 --- a/.github/workflows/test-ui.yaml +++ /dev/null @@ -1,25 +0,0 @@ -name: Tests CI - -on: [ push, pull_request ] - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v3 - with: - node-version: 18 - - uses: actions/setup-python@v4 - with: - python-version: '3.11' - - name: Install requirements - run: | - python -m pip install --upgrade pip - pip install .[dev] - - name: Run Tests - run: | - npm ci - npm run test:generate - npm test -- --verbose - working-directory: ./tests-ui \ No newline at end of file diff --git a/tests-unit/requirements.txt b/tests-unit/requirements.txt deleted file mode 100644 index d70d00f4b..000000000 --- a/tests-unit/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -pytest>=7.8.0 -pytest-aiohttp -pytest-asyncio