From 35461cdb76e131bea388d569f1d8ad8d44048bcb Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Mon, 19 Dec 2022 07:56:25 -0500 Subject: [PATCH 01/14] Update config.yml --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9430008..24c1032 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -75,13 +75,13 @@ workflows: jobs: - create-cli-linux: filters: - branches: - only: main + tags: + only: /^v*/ - create-cli-windows: filters: - branches: - only: main + tags: + only: /^v*/ - create-cli-mac: filters: - branches: - only: main \ No newline at end of file + tags: + only: /^v*/ \ No newline at end of file From 99f99be4224ef773a0bbfc53ec367ee0bc1e5354 Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 14:45:43 -0600 Subject: [PATCH 02/14] Update config.yml --- .circleci/config.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 24c1032..d10d476 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -76,12 +76,18 @@ workflows: - create-cli-linux: filters: tags: - only: /^v*/ + only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ + branches: + ignore: /.*/ - create-cli-windows: filters: tags: - only: /^v*/ + only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ + branches: + ignore: /.*/ - create-cli-mac: filters: tags: - only: /^v*/ \ No newline at end of file + only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ + branches: + ignore: /.*/ \ No newline at end of file From 8228486a4df1d86c23e08c17cd04e467ae503a60 Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 14:54:46 -0600 Subject: [PATCH 03/14] Update version.py --- src/dfm/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dfm/version.py b/src/dfm/version.py index 41e049e..5938482 100644 --- a/src/dfm/version.py +++ b/src/dfm/version.py @@ -1 +1 @@ -__version__ = "v0.2.3" +__version__ = "v0.3.0" From 49718fee0829409c4bd5e0b0a8f856fe300c050c Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 15:30:31 -0600 Subject: [PATCH 04/14] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d10d476..c8d1f44 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,7 @@ jobs: name: Build Mac CLI command: | brew install python@3.11 - curl -sSL https://install.python-poetry.org | python3 - + curl -sSL https://install.python-poetry.org | python3.11 - $HOME/.local/bin/poetry install $HOME/.local/bin/poetry run pyinstaller src/dfm/cli.py --onefile --name dfm zip -r cli-mac.zip dist/dfm From a3fef7bf90ba4cf15240be2abd2fc0060695f443 Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 15:48:01 -0600 Subject: [PATCH 05/14] Update config.yml --- .circleci/config.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c8d1f44..4fe29e6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,6 +32,11 @@ jobs: name: Build Windows CLI shell: cmd.exe command: | + choco install pyenv-win --force + refreshenv + pyenv install 3.11 + pyenv global 3.11 + $env:Path = 'C:\Users\circleci\.pyenv\pyenv-win\bin;C:\Users\circleci\.pyenv\pyenv-win\shims;' + $env:Path curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/dfm/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/ - store_artifacts: path: cli-windows.zip @@ -80,11 +85,11 @@ workflows: branches: ignore: /.*/ - create-cli-windows: - filters: - tags: - only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ - branches: - ignore: /.*/ + # filters: + # tags: + # only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ + # branches: + # ignore: /.*/ - create-cli-mac: filters: tags: From b3eff9b0d9505c092e3896f60b7822c344a82cbe Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 15:48:54 -0600 Subject: [PATCH 06/14] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4fe29e6..ec5a7ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -84,7 +84,7 @@ workflows: only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ branches: ignore: /.*/ - - create-cli-windows: + - create-cli-windows # filters: # tags: # only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ From d8985683c01a4846e729cf4d66530864ab5da77f Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 15:50:31 -0600 Subject: [PATCH 07/14] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ec5a7ec..019fec0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: name: Build Windows CLI shell: cmd.exe command: | - choco install pyenv-win --force + choco install pyenv-win -q --force refreshenv pyenv install 3.11 pyenv global 3.11 From 912187eed3510dd7dbf32c2abaf30a666c76c45c Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 15:52:04 -0600 Subject: [PATCH 08/14] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 019fec0..6c173a1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: name: Build Windows CLI shell: cmd.exe command: | - choco install pyenv-win -q --force + choco install pyenv-win -y --force refreshenv pyenv install 3.11 pyenv global 3.11 From 9f8de1e5b411ba938e0bfd5ba369ef7f2331cdea Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 15:54:33 -0600 Subject: [PATCH 09/14] Update config.yml --- .circleci/config.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6c173a1..3d4c370 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,12 +32,7 @@ jobs: name: Build Windows CLI shell: cmd.exe command: | - choco install pyenv-win -y --force - refreshenv - pyenv install 3.11 - pyenv global 3.11 - $env:Path = 'C:\Users\circleci\.pyenv\pyenv-win\bin;C:\Users\circleci\.pyenv\pyenv-win\shims;' + $env:Path - curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/dfm/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/ + choco install pyenv-win -y --force && refreshenv && pyenv install 3.11 && pyenv global 3.11 && $env:Path = 'C:\Users\circleci\.pyenv\pyenv-win\bin;C:\Users\circleci\.pyenv\pyenv-win\shims;' + $env:Path && curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/dfm/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/ - store_artifacts: path: cli-windows.zip create-cli-linux: @@ -84,12 +79,12 @@ workflows: only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ branches: ignore: /.*/ - - create-cli-windows - # filters: - # tags: - # only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ - # branches: - # ignore: /.*/ + - create-cli-windows: + filters: + tags: + only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ + branches: + ignore: /.*/ - create-cli-mac: filters: tags: From fa1fa7495dfc342836b27c5d39e33e6453a63ee7 Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 15:55:38 -0600 Subject: [PATCH 10/14] Update config.yml --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d4c370..38d8d26 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,12 +79,12 @@ workflows: only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ branches: ignore: /.*/ - - create-cli-windows: - filters: - tags: - only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ - branches: - ignore: /.*/ + - create-cli-windows + # filters: + # tags: + # only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ + # branches: + # ignore: /.*/ - create-cli-mac: filters: tags: From b8f92e411852a49693b9b962b78c8f9bee539594 Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 15:57:30 -0600 Subject: [PATCH 11/14] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 38d8d26..5341469 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: name: Build Windows CLI shell: cmd.exe command: | - choco install pyenv-win -y --force && refreshenv && pyenv install 3.11 && pyenv global 3.11 && $env:Path = 'C:\Users\circleci\.pyenv\pyenv-win\bin;C:\Users\circleci\.pyenv\pyenv-win\shims;' + $env:Path && curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/dfm/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/ + choco install pyenv-win -y --force && refreshenv && pyenv install 3.11.0 && pyenv global 3.11.0 && $env:Path = 'C:\Users\circleci\.pyenv\pyenv-win\bin;C:\Users\circleci\.pyenv\pyenv-win\shims;' + $env:Path && curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/dfm/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/ - store_artifacts: path: cli-windows.zip create-cli-linux: From 8caf357c9da925b62607a10a0f5136c8206b252a Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 16:06:01 -0600 Subject: [PATCH 12/14] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5341469..d7a822b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: name: Build Windows CLI shell: cmd.exe command: | - choco install pyenv-win -y --force && refreshenv && pyenv install 3.11.0 && pyenv global 3.11.0 && $env:Path = 'C:\Users\circleci\.pyenv\pyenv-win\bin;C:\Users\circleci\.pyenv\pyenv-win\shims;' + $env:Path && curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/dfm/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/ + choco install pyenv-win -y --force && refreshenv && pyenv install 3.11.0b4 && pyenv global 3.11.0b4 && curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/dfm/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/ - store_artifacts: path: cli-windows.zip create-cli-linux: From 23730a537de07466f561322930c2ca7e96c7581a Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Tue, 20 Dec 2022 18:44:58 -0600 Subject: [PATCH 13/14] Attempted fix of windows CICD --- .circleci/config.yml | 2 +- src/dfm/cli.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d7a822b..ea56f98 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,7 +32,7 @@ jobs: name: Build Windows CLI shell: cmd.exe command: | - choco install pyenv-win -y --force && refreshenv && pyenv install 3.11.0b4 && pyenv global 3.11.0b4 && curl -sSL https://install.python-poetry.org | python - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/dfm/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/ + choco install pyenv-win -y --force && refreshenv && pyenv install 3.11.0b4 && pyenv global 3.11.0b4 && pyenv shell 3.11.0b4 && curl -sSL https://install.python-poetry.org | python3 - && ..\AppData\Roaming\Python\Scripts\poetry install && ..\AppData\Roaming\Python\Scripts\poetry run pyinstaller src/dfm/cli.py --onefile --name dfm && 7z a ./cli-windows.zip ./dist/ - store_artifacts: path: cli-windows.zip create-cli-linux: diff --git a/src/dfm/cli.py b/src/dfm/cli.py index 678003a..3e93e96 100644 --- a/src/dfm/cli.py +++ b/src/dfm/cli.py @@ -3,8 +3,8 @@ import platform from pathlib import Path -from src.config import BuildConfig -from src.version import __version__ +from dfm.config import BuildConfig +from dfm.version import __version__ def parse_parameter_string(param_str: str) -> dict: From 3b356b14f7e511449feb8bac844fd7fb4a18e9df Mon Sep 17 00:00:00 2001 From: ServerlessSam Date: Thu, 29 Dec 2022 12:12:04 +0000 Subject: [PATCH 14/14] Update config.yml --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ea56f98..e6aa967 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -79,12 +79,12 @@ workflows: only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ branches: ignore: /.*/ - - create-cli-windows - # filters: - # tags: - # only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ - # branches: - # ignore: /.*/ + - create-cli-windows: + filters: + tags: + only: /^v[0-9]+\.[0-9]+\.[0-9]+$/ + branches: + ignore: /.*/ - create-cli-mac: filters: tags: