Merge saltstack/pepper to ArcaniteSolutions/pepper

.github/workflows/flake8.yaml

@@ -0,0 +1,21 @@
+name: flake8 lint
+on:
+  push:
+  pull_request:
+
+jobs:
+  flake8-lint:
+    runs-on: ubuntu-24.04
+    name: flake8 lint
+    steps:
+      - name: Setup python for flake8
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+      - uses: actions/checkout@v3
+      - name: Install nox
+        run: python -m pip install nox==2024.10.09
+      - name: Setup flake8
+        run: nox --force-color -e flake8 --install-only
+      - name: Run flake8
+        run: nox --force-color -e flake8 -vv

.github/workflows/test.yaml

@@ -0,0 +1,90 @@
+name: test
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 8 * * *"
+
+jobs:
+  pre-commit:
+    name: pre-commit
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.10"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pre-commit
+          pre-commit install
+      - name: Run pre-commit
+        run: pre-commit run --all-files
+
+  test:
+    name: test ${{ matrix.py }} - ${{ matrix.netapi }} - ${{ matrix.salt }}
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        py:
+          - "3.8"
+          - "3.9"
+          - "3.10"
+          - "3.11"
+        netapi:
+          - "cherrypy"
+          - "tornado"
+        salt:
+          - "v3006.9"
+          - "v3007.1"
+          - "master"
+        exclude:
+          - py: "3.8"
+            salt: "v3007.1"
+          - py: "3.9"
+            salt: "v3007.1"
+          - py: "3.8"
+            salt: "master"
+          - py: "3.9"
+            salt: "master"
+    env:
+      SALT_REQUIREMENT: ${{ matrix.salt == 'master' && 'salt@git+https://github.com/saltstack/salt.git@master' || format('salt=={0}', matrix.salt) }}
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Python ${{ matrix.py }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.py }}
+
+      - name: Install setuptools_scm
+        run: python -m pip install setuptools_scm
+
+      - name: Install dependencies
+        run: sudo apt update && sudo apt install -y libc6-dev libffi-dev gcc git openssh-server libzmq3-dev
+        env:
+          DEBIAN_FRONTEND: noninteractive
+
+      - name: Install Nox
+        run: |
+          python -m pip install --upgrade pip
+          pip install nox
+
+      - name: Install Test Requirements
+        env:
+          PYTHON_VERSIONS: ${{ matrix.py }}
+          API_BACKEND: ${{ matrix.netapi }}
+        run: |
+          nox --force-color -e tests --install-only
+
+      - name: Test
+        env:
+          PYTHON_VERSIONS: ${{ matrix.py }}
+          API_BACKEND: ${{ matrix.netapi }}
+          SKIP_REQUIREMENTS_INSTALL: YES
+        run: |
+          nox --force-color -e tests -- -vv tests/

.gitignore

@@ -6,4 +6,5 @@
 MANIFEST
 dist/
 salt_pepper.egg-info/
-.tox/
+.nox/
+artifacts/

.pre-commit-config.yaml

@@ -0,0 +1,64 @@
+---
+minimum_pre_commit_version: 3.5.0
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: check-merge-conflict  # Check for files that contain merge conflict strings.
+      - id: trailing-whitespace   # Trims trailing whitespace.
+        args: [--markdown-linebreak-ext=md]
+      - id: mixed-line-ending     # Replaces or checks mixed line ending.
+        args: [--fix=lf]
+      - id: end-of-file-fixer     # Makes sure files end in a newline and only a newline.
+      - id: check-merge-conflict  # Check for files that contain merge conflict strings.
+      - id: check-ast             # Simply check whether files parse as valid python.
+
+  # ----- Formatting ---------------------------------------------------------------------------->
+  - repo: https://github.com/myint/autoflake
+    rev: v2.2.1
+    hooks:
+      - id: autoflake
+        name: Remove unused variables and imports
+        language: python
+        args: ["--in-place", "--remove-all-unused-imports", "--remove-unused-variables", "--expand-star-imports"]
+        files: \.py$
+
+  - repo: https://github.com/saltstack/pre-commit-remove-import-headers
+    rev: 1.1.0
+    hooks:
+      - id: remove-import-headers
+
+  - repo: https://github.com/saltstack/salt-rewrite
+    # Automatically rewrite code with known rules
+    rev: 2.5.2
+    hooks:
+      - id: salt-rewrite
+        alias: rewrite-tests
+        name: Rewrite the test suite
+        files: ^tests/.*\.py$
+        args: [--silent, -E, fix_docstrings]
+
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.0
+    hooks:
+      - id: pyupgrade
+        name: Rewrite Code to be Py3+
+        args: [
+          --py3-plus
+        ]
+
+  - repo: https://github.com/asottile/reorder_python_imports
+    rev: v3.12.0
+    hooks:
+      - id: reorder-python-imports
+        args: [
+          --py3-plus,
+        ]
+
+  - repo: https://github.com/psf/black
+    rev: 23.12.1
+    hooks:
+      - id: black
+        args: [-l 100]
+
+  # <---- Formatting -----------------------------------------------------------------------------

.travis.yml

@@ -1,16 +1,11 @@
+dist: xenial
 sudo: false
 services:
 - docker
 language: python
-cache: pip
 services:
 - docker
 
-before_install:
-- pyenv versions
-- pyenv version-name
-- env
-
 install:
 - pip install tox
 
@@ -19,21 +14,28 @@ python:
 - '3.4'
 - '3.5'
 - '3.6'
-- '3.7-dev'
+- '3.7'
+- '3.8-dev'
 
 env:
-- SALT=-v2018.3 BACKEND=-cherrypy CODECOV=py
-- SALT=-v2018.3 BACKEND=-tornado CODECOV=py
-- SALT=-v2019.2 BACKEND=-cherrypy CODECOV=py
-- SALT=-v2019.2 BACKEND=-tornado CODECOV=py
+- SALT=v2018.3 BACKEND=cherrypy
+- SALT=v2018.3 BACKEND=tornado
+- SALT=v2019.2 BACKEND=cherrypy
+- SALT=v2019.2 BACKEND=tornado
+- SALT=develop BACKEND=cherrypy
+- SALT=develop BACKEND=tornado
 
 matrix:
-  env:
+  allow_failures:
+  - python: '3.8-dev'
+  - env: SALT=develop BACKEND=tornado
+  - env: SALT=develop BACKEND=cherrypy
 
 script:
-- PYTHON="${TRAVIS_PYTHON_VERSION%-dev}"
-- docker run -v $PWD:/pepper -ti --rm gtmanfred/pepper:latest tox -c /pepper/tox.ini -e "${TRAVIS_PYTHON_VERSION%%.*}flake8,${CODECOV}${PYTHON//./}${BACKEND}${SALT}"
+- PYTHON="${TRAVIS_PYTHON_VERSION/-dev/-rc}"
+- TOX_VERSION="py${PYTHON//./}"
+- docker run -v $PWD:/pepper -ti --rm "python:$PYTHON" make -C /pepper test PYVERSION="${TOX_VERSION%-rc}" SALT="${SALT}" BACKEND="${BACKEND}"
 
 after_success:
 - sudo chown $USER .tox/
-- if [[ $CODECOV == "py" ]]; then tox -e codecov; fi
+- tox -e codecov

LICENSE

@@ -13,4 +13,3 @@
    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.
-

Makefile

@@ -0,0 +1,11 @@
+PYVERSION?=py37
+SALT?=v2019.2
+BACKEND?=cherrypy
+DEBIAN_FRONTEND=noninteractive
+
+install:
+	apt update && apt install -y libc6-dev libffi-dev gcc git openssh-server libzmq3-dev
+	pip install tox
+
+test: install
+	tox -e flake8,$(PYVERSION)-$(BACKEND)-$(SALT)

README.rst

@@ -59,10 +59,10 @@ Examples leveraging the runner client.
 Configuration
 -------------
 
-You can configure pepper through the command line, using environment variables 
-or in a configuration file ``$HOME/.pepperrc`` with the following syntax : 
+You can configure pepper through the command line, using environment variables
+or in a configuration file ``$HOME/.pepperrc`` with the following syntax :
 
-.. code-block:: 
+.. code-block::
 
   [main]
   SALTAPI_URL=https://localhost:8000/

azure-pipelines.yml

@@ -0,0 +1,60 @@
+trigger:
+- develop
+
+variables:
+  python: '["py2.7", "py3.4", "py3.5", "py3.6", "py3.7", "py3.8"]'
+  salt: '["v2018.3", "v2019.2", "develop"]'
+  backends: '["cherrypy", "tornado"]'
+
+jobs:
+- job: build_matrix
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '3.7'
+      architecture: x64
+
+  - task: PythonScript@0
+    name: matrix
+    inputs:
+      scriptSource: Inline
+      script: |
+        import json
+        matrix = {}
+        for pyver in $(python):
+            for saltver in $(salt):
+                for backend in $(backends):
+                    matrix['{0}-{1}-{2}'.format(pyver, backend, saltver)] = {
+                        'python.version': pyver[2:],
+                        'version': pyver.replace('.', ''),
+                        'salt': saltver,
+                        'backend': backend,
+                    }
+        print('##vso[task.setvariable variable=matrix;isOutput=true]{0}'.format(json.dumps(matrix)))
+
+- job: test_pepper
+  dependsOn: build_matrix
+  pool:
+    vmImage: 'Ubuntu-16.04'
+  strategy:
+    matrix: $[ dependencies.build_matrix.outputs['matrix.matrix'] ]
+  steps:
+  - task: UsePythonVersion@0
+    inputs:
+      versionSpec: '$(python.version)'
+      architecture: x64
+
+  - script: |
+      pip install tox
+    displayName: Install dependencies
+  - script: |
+      docker run -v $PWD:/pepper --rm "python:$(python.version)" make -C /pepper test PYTHON_VERSION=$(version) SALT=$(salt) BACKEND=$(backend)
+    displayName: pytest
+  - script: |
+      sudo chown $USER .tox/
+      tox -e codecov
+    displayName: codecov
+    env:
+      CODECOV_TOKEN: '16c2a232-4329-438c-b163-ccbfeeab47aa'

codecov.yml

@@ -25,4 +25,3 @@ comment:
   layout: "header, diff"
   behavior: default
   require_changes: no
-