From a3a7f6e7fa145a8da3e19414861d0e4d177a29a1 Mon Sep 17 00:00:00 2001 From: shayaharon Date: Tue, 10 Jan 2023 17:00:30 +0200 Subject: [PATCH 1/7] config fixed --- .circleci/config.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aef3956b78..b9b0954b6e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -325,9 +325,7 @@ jobs: steps: - deci-common/checkout_and_skip_build: check_version_file: true - - run: - name: verify __version__ - command: python3 tests/verify_version.py $CIRCLE_TAG + - run: name: add requirements.txt and requirements.pro.txt to source code command: | @@ -344,6 +342,13 @@ jobs: - deci-common/pip_test_package_installation_codeartifact_dev: package_name: "super-gradients" version: $CIRCLE_TAG + venv_name: dev-sg-test + + - run: + name: verify __version__ + command: | + source + python3 tests/verify_version.py $CIRCLE_TAG - deci-common/pip_test_package_installation_codeartifact_prod: package_name: "super-gradients" From 06bdc842c0d4cebaaf77e9fe2bb5257f03d38c75 Mon Sep 17 00:00:00 2001 From: ranrubin Date: Tue, 10 Jan 2023 17:28:40 +0200 Subject: [PATCH 2/7] testing --- .circleci/config.yml | 81 +++++++++++++++++++++++++++++++++----------- 1 file changed, 62 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b9b0954b6e..78a1f325d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -320,6 +320,9 @@ jobs: parameters: py_version: type: string + dev_venv_name: + type: string + default: "dev-sg-${CIRCLE_BUILD_NUM}" docker: - image: cimg/python:<< parameters.py_version >> steps: @@ -342,12 +345,12 @@ jobs: - deci-common/pip_test_package_installation_codeartifact_dev: package_name: "super-gradients" version: $CIRCLE_TAG - venv_name: dev-sg-test + venv_name: << parameters.dev_venv_name >> - run: name: verify __version__ command: | - source + . << parameters.dev_venv_name >>/bin/activate python3 tests/verify_version.py $CIRCLE_TAG - deci-common/pip_test_package_installation_codeartifact_prod: @@ -409,6 +412,43 @@ jobs: + ran_test_delete: #todo: delete me + parameters: + py_version: + type: string + dev_venv_name: + type: string + default: "dev-sg-${CIRCLE_BUILD_NUM}" + docker: + - image: cimg/python:<< parameters.py_version >> + steps: + - deci-common/checkout_and_skip_build: + check_version_file: true + - run: + name: add requirements.txt and requirements.pro.txt to source code + command: | + cp requirements.txt src/super_gradients/requirements.txt + cp requirements.pro.txt src/super_gradients/requirements.pro.txt + - run: + name: edit package version + command: | + echo 0.0.999b123 > version.txt + + - deci-common/pip_upload_package_codeartifact_all_accounts: + codeartifact_repository: "deci-packages" + + - deci-common/pip_test_package_installation_codeartifact_dev: + package_name: "super-gradients" + version: 0.0.999b123 + venv_name: << parameters.dev_venv_name >> + + - run: + name: verify __version__ + command: | + . << parameters.dev_venv_name >>/bin/activate + python3 tests/verify_version.py 0.0.999b123 + + workflows: release: jobs: @@ -448,25 +488,28 @@ workflows: build_and_deploy: jobs: - - deci-common/persist_version_info: - use_rc: true - use_beta: false - version_override: "" - - deci-common/codeartifact_login: - repo_name: "deci-packages" - - build: - name: "build3.7" + - ran_test_delete: py_version: "3.7" - package_name: "super-gradients" - requires: - - deci-common/persist_version_info - - deci-common/codeartifact_login - - release_candidate: # happens on merge - py_version: "3.7" - requires: - - "build3.7" - <<: *release_candidate_filter +# - deci-common/persist_version_info: +# use_rc: true +# use_beta: false +# version_override: "" +# - deci-common/codeartifact_login: +# repo_name: "deci-packages" +# - build: +# name: "build3.7" +# py_version: "3.7" +# package_name: "super-gradients" +# requires: +# - deci-common/persist_version_info +# - deci-common/codeartifact_login +# +# - release_candidate: # happens on merge +# py_version: "3.7" +# requires: +# - "build3.7" +# <<: *release_candidate_filter SG_docker: jobs: From 90b8b934ae8dac8b6da6a6e36b7f00e5dd064f3b Mon Sep 17 00:00:00 2001 From: ranrubin Date: Tue, 10 Jan 2023 17:38:36 +0200 Subject: [PATCH 3/7] testing --- .circleci/config.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 78a1f325d0..975084ad1d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -422,20 +422,6 @@ jobs: docker: - image: cimg/python:<< parameters.py_version >> steps: - - deci-common/checkout_and_skip_build: - check_version_file: true - - run: - name: add requirements.txt and requirements.pro.txt to source code - command: | - cp requirements.txt src/super_gradients/requirements.txt - cp requirements.pro.txt src/super_gradients/requirements.pro.txt - - run: - name: edit package version - command: | - echo 0.0.999b123 > version.txt - - - deci-common/pip_upload_package_codeartifact_all_accounts: - codeartifact_repository: "deci-packages" - deci-common/pip_test_package_installation_codeartifact_dev: package_name: "super-gradients" From bf56965460f071f3ffd009ea3a44ded5f7762090 Mon Sep 17 00:00:00 2001 From: ranrubin Date: Tue, 10 Jan 2023 17:51:18 +0200 Subject: [PATCH 4/7] testing --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 975084ad1d..6536e9eba9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -425,13 +425,13 @@ jobs: - deci-common/pip_test_package_installation_codeartifact_dev: package_name: "super-gradients" - version: 0.0.999b123 + version: 0.0.999b123 #TODO: vhangwe to circkle cag venv_name: << parameters.dev_venv_name >> - - run: + - run: #TODO: vhangwe to circkle cag name: verify __version__ command: | - . << parameters.dev_venv_name >>/bin/activate + . << parameters.dev_venv_name >>-super-gradients-0.0.999b123/bin/activate python3 tests/verify_version.py 0.0.999b123 From 24c07fae5e14167eb67a100a4996845945a13c56 Mon Sep 17 00:00:00 2001 From: ranrubin Date: Wed, 11 Jan 2023 09:14:11 +0200 Subject: [PATCH 5/7] testing --- .circleci/config.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6536e9eba9..f2e35676c2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -422,7 +422,11 @@ jobs: docker: - image: cimg/python:<< parameters.py_version >> steps: - + - checkout + - run: + name: edit package version #TODO: vhangwe to circkle cag + command: | + echo 0.0.999b123 > version.txt - deci-common/pip_test_package_installation_codeartifact_dev: package_name: "super-gradients" version: 0.0.999b123 #TODO: vhangwe to circkle cag From 9627e8f59b9635864e9024101c081f74325055fa Mon Sep 17 00:00:00 2001 From: ranrubin Date: Wed, 11 Jan 2023 09:22:40 +0200 Subject: [PATCH 6/7] testing --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f2e35676c2..045425b14a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -436,7 +436,7 @@ jobs: name: verify __version__ command: | . << parameters.dev_venv_name >>-super-gradients-0.0.999b123/bin/activate - python3 tests/verify_version.py 0.0.999b123 + python3 tests/verify_version.py 3.0.6 workflows: From 0fd4deaf13c530c0e5d63dc456210f3c696e7e48 Mon Sep 17 00:00:00 2001 From: ranrubin Date: Wed, 11 Jan 2023 09:29:35 +0200 Subject: [PATCH 7/7] a working flow --- .circleci/config.yml | 72 ++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 53 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 045425b14a..672eb178ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -328,7 +328,6 @@ jobs: steps: - deci-common/checkout_and_skip_build: check_version_file: true - - run: name: add requirements.txt and requirements.pro.txt to source code command: | @@ -346,11 +345,10 @@ jobs: package_name: "super-gradients" version: $CIRCLE_TAG venv_name: << parameters.dev_venv_name >> - - run: - name: verify __version__ + name: verify that the output of __version__ is what we expect command: | - . << parameters.dev_venv_name >>/bin/activate + . << parameters.dev_venv_name >>-super-gradients-$CIRCLE_TAG/bin/activate python3 tests/verify_version.py $CIRCLE_TAG - deci-common/pip_test_package_installation_codeartifact_prod: @@ -410,35 +408,6 @@ jobs: command: "rm -r << parameters.sg_new_env_name >>" when: on_fail - - - ran_test_delete: #todo: delete me - parameters: - py_version: - type: string - dev_venv_name: - type: string - default: "dev-sg-${CIRCLE_BUILD_NUM}" - docker: - - image: cimg/python:<< parameters.py_version >> - steps: - - checkout - - run: - name: edit package version #TODO: vhangwe to circkle cag - command: | - echo 0.0.999b123 > version.txt - - deci-common/pip_test_package_installation_codeartifact_dev: - package_name: "super-gradients" - version: 0.0.999b123 #TODO: vhangwe to circkle cag - venv_name: << parameters.dev_venv_name >> - - - run: #TODO: vhangwe to circkle cag - name: verify __version__ - command: | - . << parameters.dev_venv_name >>-super-gradients-0.0.999b123/bin/activate - python3 tests/verify_version.py 3.0.6 - - workflows: release: jobs: @@ -478,28 +447,25 @@ workflows: build_and_deploy: jobs: - - ran_test_delete: + - deci-common/persist_version_info: + use_rc: true + use_beta: false + version_override: "" + - deci-common/codeartifact_login: + repo_name: "deci-packages" + - build: + name: "build3.7" py_version: "3.7" + package_name: "super-gradients" + requires: + - deci-common/persist_version_info + - deci-common/codeartifact_login -# - deci-common/persist_version_info: -# use_rc: true -# use_beta: false -# version_override: "" -# - deci-common/codeartifact_login: -# repo_name: "deci-packages" -# - build: -# name: "build3.7" -# py_version: "3.7" -# package_name: "super-gradients" -# requires: -# - deci-common/persist_version_info -# - deci-common/codeartifact_login -# -# - release_candidate: # happens on merge -# py_version: "3.7" -# requires: -# - "build3.7" -# <<: *release_candidate_filter + - release_candidate: # happens on merge + py_version: "3.7" + requires: + - "build3.7" + <<: *release_candidate_filter SG_docker: jobs: