From cb312147a8ada74741a2ecc0da2aff5949a4bebe Mon Sep 17 00:00:00 2001 From: Dramelac Date: Sat, 24 Aug 2024 17:40:34 +0200 Subject: [PATCH 1/9] Update next version test --- tests/test_exegol.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_exegol.py b/tests/test_exegol.py index 2de37b16..15f0d804 100644 --- a/tests/test_exegol.py +++ b/tests/test_exegol.py @@ -2,4 +2,4 @@ def test_version(): - assert __version__ == '4.3.5' + assert __version__ == '4.3.6' From 18e51049186a3c8637e05ece361cfd384cb128e3 Mon Sep 17 00:00:00 2001 From: Dramelac Date: Sat, 24 Aug 2024 17:56:47 +0200 Subject: [PATCH 2/9] Git always handle shell file with LF line ending --- .gitattributes | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..2f4411bd --- /dev/null +++ b/.gitattributes @@ -0,0 +1,8 @@ +# Default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Handle python file as text +*.py text + +# Every shell file must be cloned with LF line ending +*.sh text eol=lf \ No newline at end of file From 08fbd04054399def7496314f790180e650d32b8e Mon Sep 17 00:00:00 2001 From: Dramelac Date: Sun, 25 Aug 2024 11:53:26 +0200 Subject: [PATCH 3/9] Add package install testing --- .github/workflows/entrypoint_nightly.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/entrypoint_nightly.yml b/.github/workflows/entrypoint_nightly.yml index ad37f42c..ee852b00 100644 --- a/.github/workflows/entrypoint_nightly.yml +++ b/.github/workflows/entrypoint_nightly.yml @@ -29,11 +29,15 @@ jobs: with: python-version: "3.10" - name: Install requirements - run: python -m pip install --user build + run: python -m pip install --user build venv - name: Cleaning run : python setup.py clean - name: Build Exegol run: python -m build --sdist --outdir dist/ . + - name: Create testing venv + run: python -m venv vtest + - name: Install pip package + run: ./vtest/bin/pip install ./dist/* - name: Publish distribution 📦 to Test PyPI uses: pypa/gh-action-pypi-publish@release/v1 if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') From 70b2eb4aa98cab7dc6c5ed3532b6802c5ed93d5f Mon Sep 17 00:00:00 2001 From: Dramelac Date: Sun, 25 Aug 2024 11:54:52 +0200 Subject: [PATCH 4/9] Always run pipeline for testing --- .github/workflows/entrypoint_nightly.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/entrypoint_nightly.yml b/.github/workflows/entrypoint_nightly.yml index ee852b00..c9390091 100644 --- a/.github/workflows/entrypoint_nightly.yml +++ b/.github/workflows/entrypoint_nightly.yml @@ -4,8 +4,8 @@ on: push: branches: - "dev" - paths: - - "**.py" + #paths: + # - "**.py" jobs: test: From 661279362913dac6d7dce7b9defb92956cc976a0 Mon Sep 17 00:00:00 2001 From: Dramelac Date: Sun, 25 Aug 2024 13:07:34 +0200 Subject: [PATCH 5/9] Fix venv package name --- .github/workflows/entrypoint_nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/entrypoint_nightly.yml b/.github/workflows/entrypoint_nightly.yml index c9390091..78f93326 100644 --- a/.github/workflows/entrypoint_nightly.yml +++ b/.github/workflows/entrypoint_nightly.yml @@ -29,7 +29,7 @@ jobs: with: python-version: "3.10" - name: Install requirements - run: python -m pip install --user build venv + run: python -m pip install --user build virtualenv - name: Cleaning run : python setup.py clean - name: Build Exegol From 8c5d72d66c5ad39a8c1b327ceb9c02514a3f04cf Mon Sep 17 00:00:00 2001 From: Dramelac Date: Sun, 25 Aug 2024 13:11:26 +0200 Subject: [PATCH 6/9] Upgrade python testing version --- .github/workflows/entrypoint_nightly.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/entrypoint_nightly.yml b/.github/workflows/entrypoint_nightly.yml index 78f93326..22dbf020 100644 --- a/.github/workflows/entrypoint_nightly.yml +++ b/.github/workflows/entrypoint_nightly.yml @@ -27,7 +27,9 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" + - name: Upgrade pip + run: python -m pip install --upgrade pip - name: Install requirements run: python -m pip install --user build virtualenv - name: Cleaning From 7b918a43e02a2f36b764d6c96fe5639366c00aba Mon Sep 17 00:00:00 2001 From: Dramelac Date: Mon, 26 Aug 2024 18:11:35 +0200 Subject: [PATCH 7/9] Revert dynamic requirements --- requirements.txt | 2 +- setup.py | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index af0af7db..cf72eb36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,4 @@ rich~=13.7.1 GitPython~=3.1.43 PyYAML>=6.0.2 argcomplete~=3.5.0 -tzlocal~=5.2 +tzlocal~=5.2; platform_system != 'Linux' diff --git a/setup.py b/setup.py index 89d4c500..4cb8c89a 100644 --- a/setup.py +++ b/setup.py @@ -31,9 +31,6 @@ for k, v in data_files_dict.items(): data_files.append((k, v)) -with open("requirements.txt", "r", encoding="utf-8") as f: - requirements = [x.strip() for x in f.readlines()] - setup( name='Exegol', version=__version__, @@ -57,7 +54,15 @@ "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", "Operating System :: OS Independent", ], - install_requires=requirements, + install_requires=[ + 'docker~=7.1.0', + 'requests~=2.32.3', + 'rich~=13.7.1', + 'GitPython~=3.1.43', + 'PyYAML>=6.0.2', + 'argcomplete~=3.5.0', + 'tzlocal~=5.2; platform_system != "Linux"' + ], packages=find_packages(exclude=["tests"]), include_package_data=True, data_files=data_files, From 91b5466e8d27dce76b6d09c6ae74702705ae64b6 Mon Sep 17 00:00:00 2001 From: Dramelac Date: Mon, 26 Aug 2024 18:17:38 +0200 Subject: [PATCH 8/9] Install setuptools for py 3.12 --- .github/workflows/entrypoint_nightly.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/entrypoint_nightly.yml b/.github/workflows/entrypoint_nightly.yml index 22dbf020..37db5656 100644 --- a/.github/workflows/entrypoint_nightly.yml +++ b/.github/workflows/entrypoint_nightly.yml @@ -31,7 +31,7 @@ jobs: - name: Upgrade pip run: python -m pip install --upgrade pip - name: Install requirements - run: python -m pip install --user build virtualenv + run: python -m pip install --user build virtualenv setuptools - name: Cleaning run : python setup.py clean - name: Build Exegol From f6c18c36701a8493558c3721b9ab71d543f78e87 Mon Sep 17 00:00:00 2001 From: Dramelac Date: Mon, 26 Aug 2024 21:32:57 +0200 Subject: [PATCH 9/9] Ready to release --- exegol/config/ConstantConfig.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exegol/config/ConstantConfig.py b/exegol/config/ConstantConfig.py index c4519dde..7315741e 100644 --- a/exegol/config/ConstantConfig.py +++ b/exegol/config/ConstantConfig.py @@ -5,7 +5,7 @@ class ConstantConfig: """Constant parameters information""" # Exegol Version - version: str = "4.3.5" + version: str = "4.3.6" # Exegol documentation link documentation: str = "https://exegol.rtfd.io/"