Merge branch 'master' into ENG-2912-nuget-symbols-flag-duplicate-error

Author: lskillen

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.1
+current_version = 1.8.0
 commit = True
 tag = True
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<revision>\d+)

.circleci/config.yml

@@ -57,25 +57,10 @@ orbs:
           - run:
               name: Install dependencies
               command: |
-                python3 -m venv .venv
+                python3 -m pip install uv
+                uv venv .venv
+                uv pip install -r requirements.txt
                 . .venv/bin/activate
-                pip install -r requirements.txt
-          - when:
-              condition: <<parameters.is_test_suite>>
-              steps:
-                - run:
-                    name: Setup Code Climate coverage reporter
-                    command: |
-                      test "$CIRCLE_LOCAL" == "true" || {
-                        curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter;
-                        chmod +x ./cc-test-reporter;
-                      }
-                - run:
-                    name: Notify Code Climate of pending test report
-                    command:
-                      test "$CIRCLE_LOCAL" == "true" || {
-                        ./cc-test-reporter before-build;
-                      }
           - save_cache:
               paths:
                 - .venv
@@ -94,18 +79,11 @@ orbs:
                     path: ./reports
                 - store_artifacts:
                     path: ./reports
-                - deploy:
-                    command: |
-                      test "$CIRCLE_LOCAL" == "true" || {
-                        . .venv/bin/activate
-                        cp ./reports/coverage.xml .;
-                        ./cc-test-reporter after-build -t coverage.py --exit-code $(cat /tmp/run_exit_code);
-                      }
 
     executors:
       cloudsmith_executor:
         docker:
-          - image: circleci/python:3.8
+          - image: circleci/python:3.9
 
 
 workflows:
@@ -135,13 +113,8 @@ workflows:
       - cloudsmith_ci/execute:
           name: pytest
           service_name: pytest
-          command: pytest --cov-report xml:./reports/coverage.xml --junitxml ./reports/pytest.xml
+          command: pytest --junitxml ./reports/pytest.xml
           is_test_suite: true
-      - python/test:
-          name: pytest-python3.9
-          version: "3.9"
-          pkg-manager: pip
-          pip-dependency-file: requirements.txt
       - python/test:
           name: pytest-python3.10
           version: "3.10"
@@ -152,6 +125,16 @@ workflows:
           version: "3.11"
           pkg-manager: pip
           pip-dependency-file: requirements.txt
+      - python/test:
+          name: pytest-python3.12
+          version: "3.12"
+          pkg-manager: pip
+          pip-dependency-file: requirements.txt
+      - python/test:
+          name: pytest-python3.13
+          version: "3.13"
+          pkg-manager: pip
+          pip-dependency-file: requirements.txt
       - publish:
           filters:
             branches:

.envrc

@@ -5,11 +5,29 @@ set -e
 # development dependencies. Based on:
 # https://hynek.me/til/python-project-local-venvs/
 export VIRTUAL_ENV=.venv
-layout pyenv 3.8.16
-. .venv/bin/activate
-python -m pip install -q -r requirements.txt
+
+PYTHON_VERSION="3.9.19"
+
+# Check if .venv exists and the Python version matches
+if [ -d ".venv" ]; then
+  CURRENT_VERSION=$(source .venv/bin/activate && python --version 2>&1 | cut -d' ' -f2)
+
+  if [ "$CURRENT_VERSION" != "$PYTHON_VERSION" ]; then
+    echo "Current Python version ($CURRENT_VERSION) does not match the desired version ($PYTHON_VERSION). Recreating .venv..."
+    rm -rf .venv
+  fi
+fi
+
+python -m uv venv .venv --python $PYTHON_VERSION
+python -m uv pip install -U pip uv
+python -m uv pip install -e .
+
+source ./.venv/bin/activate
 
 # Load environment variables from the .env file (for pytest, mainly)
+if [ ! -f .env ]; then
+  cp .env.example .env
+fi
 dotenv
 
 # Install pre-commit hooks

.github/workflows/release.yml

@@ -0,0 +1,45 @@
+name: Create Zipapp and Release
+
+on:
+    push:
+        tags:
+            - "v*"
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Set up Python 3.9
+              uses: actions/setup-python@v2
+              with:
+                  python-version: 3.9
+            - name: Install dependencies
+              run: |
+                  python -m pip install --upgrade pip
+                  pip install shiv
+            - name: Get version
+              id: get_version
+              run: echo "VERSION=$(cat cloudsmith_cli/data/VERSION)" >> $GITHUB_ENV
+            - name: Create Zipapp
+              run: shiv -o cloudsmith-${{ env.VERSION }}.pyz -c cloudsmith .
+            - name: Create Release
+              id: create_release
+              uses: actions/create-release@v1
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  tag_name: v${{ env.VERSION }}
+                  release_name: Release v${{ env.VERSION }}
+                  draft: false
+                  prerelease: false
+            - name: Upload Release Asset
+              id: upload-release-asset
+              uses: actions/upload-release-asset@v1
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              with:
+                  upload_url: ${{ steps.create_release.outputs.upload_url }}
+                  asset_path: ./cloudsmith-${{ env.VERSION }}.pyz
+                  asset_name: cloudsmith-${{ env.VERSION }}.pyz
+                  asset_content_type: application/zip

.gitignore

@@ -40,3 +40,6 @@ reports/
 
 # dotenv
 .env
+
+# Zipapp
+*.pyz

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # See: https://pre-commit.com/hooks.html
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v5.0.0
   hooks:
   - id: check-added-large-files
   - id: check-ast
@@ -42,23 +42,23 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/psf/black
-  rev: 23.3.0
+  rev: 25.1.0
   hooks:
   - id: black
 
 - repo: https://github.com/pycqa/flake8
-  rev: '4.0.1'
+  rev: '7.1.2'
   hooks:
   - id: flake8
     args: ['--config=.flake8']
 
 - repo: https://github.com/pycqa/isort
-  rev: 5.11.5
+  rev: 6.0.1
   hooks:
   - id: isort
 
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.10.1
+    rev: v3.19.1
     hooks:
     -   id: pyupgrade
 

.pylintrc

@@ -88,7 +88,7 @@ persistent=yes
 
 # Minimum Python version to use for version dependent checks. Will default to
 # the version used to run pylint.
-py-version=3.8
+py-version=3.9
 
 # Discover python modules and packages in the file system subtree.
 recursive=no

CHANGELOG.md

@@ -5,10 +5,97 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-**Note:** Until 1.0 any MAJOR or MINOR release may have backwards-incompatible changes.
-
 ## [Unreleased]
 
+## [1.8.0] - 2025-05-02
+
+### Added
+
+- Added support for managing User API Tokens ([#192](https://github.com/cloudsmith-io/cloudsmith-cli/pull/192))
+
+## [1.7.2] - 2025-04-28
+
+### Added
+
+- Added a fix for certain login error messages being suppressed ([#196](https://github.com/cloudsmith-io/cloudsmith-cli/pull/196))
+
+## [1.7.1] - 2025-04-25
+
+### Added
+
+- Added support for 2FA authentication when logging in ([#188](https://github.com/cloudsmith-io/cloudsmith-cli/pull/188))
+
+## [1.7.0] - 2025-03-31
+
+### Added
+
+- Added `--extra-files` parameter for Maven upload command ([#190](https://github.com/cloudsmith-io/cloudsmith-cli/pull/190))
+
+## [1.6.2] - 2025-03-27
+
+- Added html templates for saml response endpoints
+- Added json support for whoami
+- Added support for additional headers to be passed to the saml authentication flow
+
+## [1.5.0] - 2025-03-21
+
+### Added
+
+- Added `--sort` flag for package list command ([#185](https://github.com/cloudsmith-io/cloudsmith-cli/pull/185))
+
+### Fixed
+
+- Fixed `cloudsmith auth` command where it results in `403` ([#183](https://github.com/cloudsmith-io/cloudsmith-cli/pull/183))
+
+## [1.4.1] - 2024-11-26
+
+### Added
+
+ - Update cloudsmith-api to v2.0.16 ([#181](https://github.com/cloudsmith-io/cloudsmith-cli/pull/181))
+
+
+## [1.4.0] - 2024-11-04
+
+### Added
+
+- Dropped support for Python 3.8. ([#137](https://github.com/cloudsmith-io/cloudsmith-cli/pull/137))
+
+## [1.3.1] - 2024-10-08
+
+### Fixed
+
+ - Missing dependency from `setup.py` file ([#177](https://github.com/cloudsmith-io/cloudsmith-cli/pull/177))
+
+## [1.3.0] - 2024-10-08
+
+### Added
+
+- The `auth` command, enabling users to authenticate against the API with their organization's configured SAML provider ([#174](https://github.com/cloudsmith-io/cloudsmith-cli/pull/174))
+
+## [1.2.5] - 2024-06-11
+
+### Added
+
+- Produce CLI zipapp artefact on release ([#164](https://github.com/cloudsmith-io/cloudsmith-cli/pull/164))
+
+## [1.2.3] - 2024-04-10
+
+### Fixed
+
+- Show pagination info for `repos get` ([#163](https://github.com/cloudsmith-io/cloudsmith-cli/pull/163))
+
+## [1.2.2] - 2024-04-05
+
+### Added
+
+- Support for Swift package uploads ([#161](https://github.com/cloudsmith-io/cloudsmith-cli/pull/161))
+
+## [1.2.0] - 2024-03-13
+
+### Added
+
+- Support for CRAN upstreams ([#157](https://github.com/cloudsmith-io/cloudsmith-cli/pull/157))
+
 ## [1.1.1] - 2023-09-13
 
 ### Fixed

CONTRIBUTING.md

@@ -36,7 +36,7 @@ To make a new release for `cloudsmith-cli`:
 $ bumpversion <major|minor|revision>
 ```
 
-A tag will automatically created along with the version bump commit.
+A tag will automatically created along with the version bump commit. Push the tag with `git push origin {version}`
 
 Please ensure that [CHANGELOG.md](./CHANGELOG.md) is updated appropriately with each release.
 

CONTRIBUTORS.md

@@ -10,6 +10,7 @@ The following maintainers manage the project and are reponsible for reviewing/me
 
 The following contributors (in alphabetical order) are held in eternal high esteem and gratitude for their glorious contributions to the project:
 
+- Carlos Gonzalez ([@LowzG](https://github.com/LowzG))
 - Jamie Brynes ([@jamiebrynes7](https://github.com/jamiebrynes7))
 - Patrick McClory ([@mcclory](https://github.com/mcclory))