diff --git a/.github/workflows/old_publish.yaml b/.github/workflows/old_publish.yaml index f7807466c3..e69de29bb2 100644 --- a/.github/workflows/old_publish.yaml +++ b/.github/workflows/old_publish.yaml @@ -1,32 +0,0 @@ -name: Upload Old Python Package - -on: workflow_dispatch - -permissions: - contents: read - -defaults: - run: - working-directory: "./compat/snowflake-cli-labs" - -jobs: - deploy: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - persist-credentials: false - - name: Set up Python - uses: actions/setup-python@v5 - with: - python-version: "3.11" - - name: - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install hatch - - name: Build package - run: python -m hatch build - - name: Publish package - run: python -m hatch publish -u __token__ -a ${{ secrets.PYPI_TOKEN }} diff --git a/README.md b/README.md index f4b9b5760a..92486c4631 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ For complete installation and usage instructions, refer to the Requires Python >= 3.8 ```bash -pip install snowflake-cli +pip install snowflake-cli-labs snow --help ``` diff --git a/compat/snowflake-cli-labs/LICENSE b/compat/snowflake-cli-labs/LICENSE deleted file mode 100644 index 48773d3d3c..0000000000 --- a/compat/snowflake-cli-labs/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright 2024 Snowflake Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/compat/snowflake-cli-labs/README.md b/compat/snowflake-cli-labs/README.md deleted file mode 100644 index b8b665eaa0..0000000000 --- a/compat/snowflake-cli-labs/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# Snowflake Developer CLI - -This package has been renamed. Use `pip install snowflake-cli` instead. - -New package: https://pypi.org/project/snowflake-cli/ diff --git a/compat/snowflake-cli-labs/pyproject.toml b/compat/snowflake-cli-labs/pyproject.toml deleted file mode 100644 index de1f4a9820..0000000000 --- a/compat/snowflake-cli-labs/pyproject.toml +++ /dev/null @@ -1,26 +0,0 @@ -[build-system] -requires = ["hatchling"] -build-backend = "hatchling.build" - -[project] -name = "snowflake-cli-labs" -authors = [{ name = "Snowflake Inc." }] -license = { file = "LICENSE" } -dynamic = ["version"] -requires-python = ">=3.8" -description = "Snowflake CLI" -readme = "README.md" -dependencies = ["snowflake-cli==2.0.0"] -classifiers = [ - "Development Status :: 7 - Inactive" -] - -[project.urls] -"Source code" = "https://github.com/Snowflake-Labs/snowcli" -"Bug Tracker" = "https://github.com/Snowflake-Labs/snowcli/issues" - -[tool.hatch.build.targets.wheel] -packages = ["README.md"] - -[tool.hatch.version] -path = "../../src/snowflake/cli/__about__.py" diff --git a/pyproject.toml b/pyproject.toml index c4d9299818..80c24257bc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = ["hatchling"] build-backend = "hatchling.build" [project] -name = "snowflake-cli" +name = "snowflake-cli-labs" authors = [{ name = "Snowflake Inc." }] license = { file = "LICENSE" } dynamic = ["version"] diff --git a/test_external_plugins/multilingual_hello_command_group/pyproject.toml b/test_external_plugins/multilingual_hello_command_group/pyproject.toml index e07375abf5..a20d502881 100644 --- a/test_external_plugins/multilingual_hello_command_group/pyproject.toml +++ b/test_external_plugins/multilingual_hello_command_group/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" name = "snowflakecli-test-multilingual-hello-plugin" requires-python = ">=3.8" dependencies = [ - "snowflake-cli>=1.1.0" + "snowflake-cli-labs>=1.1.0" ] version = "0.0.1" diff --git a/test_external_plugins/snowpark_hello_single_command/pyproject.toml b/test_external_plugins/snowpark_hello_single_command/pyproject.toml index df66799e82..dac8bd7e1a 100644 --- a/test_external_plugins/snowpark_hello_single_command/pyproject.toml +++ b/test_external_plugins/snowpark_hello_single_command/pyproject.toml @@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta" name = "snowflakecli-test-snowpark-hello-plugin" requires-python = ">=3.8" dependencies = [ - "snowflake-cli>=1.1.0" + "snowflake-cli-labs>=1.1.0" ] version = "0.0.1" diff --git a/tests_e2e/conftest.py b/tests_e2e/conftest.py index a95e4aabb6..1622298fbb 100644 --- a/tests_e2e/conftest.py +++ b/tests_e2e/conftest.py @@ -67,7 +67,7 @@ def _install_snowcli_with_external_plugin( "-m", "pip", "install", - test_root_path / f"../dist/snowflake_cli-{version}-py3-none-any.whl", + test_root_path / f"../dist/snowflake_cli_labs-{version}-py3-none-any.whl", ] ) subprocess.check_call(