Merge pull request #1474 from eemperor/0.21.4

Releases watchmaker version 0.21.4

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.21.3
+current_version = 0.21.4
 commit = False
 tag = False
 tag_name = {new_version}

.travis.yml

@@ -1,3 +1,5 @@
+version: ~> 1.0
+
 dist: bionic
 language: python
 stages:
@@ -12,7 +14,7 @@ python:
   - 3.5
   - 3.6
   - 3.7
-stage: test
+if: branch in (master, develop) OR type = pull_request OR tag is present
 before_install:
   # don't overwrite env if it's already set (otherwise check, docs won't work properly)
   - export TOXENV="${TOXENV:-$TRAVIS_PYTHON_VERSION-codecov}"
@@ -36,6 +38,7 @@ before_script:
       ver=$(git show -s --format=%cd --date=format:'%Y%m%d%H%M%S')
       sed -i -E "s/^(version = )([0-9]+\.[0-9]+\.[0-9]+).*$/\1\2.dev$ver/" setup.cfg
     fi
+  - grep "version = " setup.cfg
 after_failure:
   - more .tox/log/* | cat
   - more .tox/*/log/* | cat
@@ -53,47 +56,28 @@ jobs:
     - stage: test
       python: 2.6
       dist: trusty
+
     - stage: test
       python: 3.4
       dist: xenial
+
     - stage: test
+      name: lint
       python: 3.6
       env:
         - TOXENV=check
+
     - stage: test
+      name: docs
       python: 3.6
       env:
         - TOXENV=docs
-    - stage: deploy
-      if: type != pull_request AND (branch = develop OR tag is present)
-      python: 2.7
-      install: skip
-      script: echo "Deploying..."
-      deploy:
-      - provider: pypi
-        server: https://test.pypi.org/legacy/
-        distributions: sdist bdist_wheel
-        user: plus3it
-        password: $PYPI_TEST_PASSWORD
-        skip_cleanup: true
-        skip_upload_docs: true
-        on:
-          branch: develop
-      - provider: pypi
-        distributions: sdist bdist_wheel
-        user: plus3it
-        password: $PYPI_PASSWORD
-        skip_cleanup: true
-        skip_upload_docs: true
-        on:
-          tags: true
-    - stage: deploy
-      if: type != pull_request AND (branch in (master, develop) OR tag is present)
+
+    - stage: test
+      name: build standalone
       python: 3.6
-      install:
-        - echo "Install"
-      script:
-        - chmod +x ci/prep_docker.sh && sudo ci/prep_docker.sh
+      install: chmod +x ci/prep_docker.sh
+      script: ci/prep_docker.sh
       before_deploy:
         # prepare deployment envs
         - source .gravitybee/gravitybee-environs.sh
@@ -102,6 +86,8 @@ jobs:
         - export SATS_REL_NAME="Release v$GB_ENV_APP_VERSION"
         - echo Tag name is $SATS_TAG
         - pip install -r requirements/deploy.txt
+        - echo Deploying "$(grep 'version = ' setup.cfg)"
+      after_deploy: echo Deployed "$(grep 'version = ' setup.cfg)"
       deploy:
         - provider: script
           # deploy to github releases
@@ -111,15 +97,42 @@ jobs:
             branch: master
         - provider: s3
           bucket: $RELEASE_BUCKET
-          upload-dir: $S3_KEYFIX
-          local-dir: $GB_ENV_STAGING_DIR
+          upload_dir: $S3_KEYFIX
+          local_dir: $GB_ENV_STAGING_DIR
           skip_cleanup: true
           on:
             tags: true
         - provider: s3
           bucket: $DEV_BUCKET
-          upload-dir: $S3_KEYFIX
-          local-dir: $GB_ENV_STAGING_DIR
+          upload_dir: $S3_KEYFIX
+          local_dir: $GB_ENV_STAGING_DIR
           skip_cleanup: true
           on:
             branch: develop
+
+    - stage: deploy
+      name: deploy to pypi
+      if: type != pull_request AND (branch = develop OR tag is present)
+      python: 2.7
+      install: skip
+      script: skip
+      before_deploy: echo Deploying "$(grep 'version = ' setup.cfg)"
+      after_deploy: echo Deployed "$(grep 'version = ' setup.cfg)"
+      deploy:
+      - provider: pypi
+        server: https://test.pypi.org/legacy/
+        distributions: sdist bdist_wheel
+        username: plus3it
+        password: $PYPI_TEST_PASSWORD
+        skip_cleanup: true
+        skip_upload_docs: true
+        on:
+          branch: develop
+      - provider: pypi
+        distributions: sdist bdist_wheel
+        username: plus3it
+        password: $PYPI_PASSWORD
+        skip_cleanup: true
+        skip_upload_docs: true
+        on:
+          tags: true

CHANGELOG.md

@@ -1,5 +1,16 @@
 ## Changelog
 
+### 0.21.4
+
+**Commit Delta**: [Change from 0.21.3 release](https://github.com/plus3it/watchmaker/compare/0.21.3...0.21.4)
+
+**Released**: 2020.12.04
+
+**Summary**:
+
+*   nessus-agent-formula
+    - (Linux) Switch to using Salt service state to ensure Nessus agent service is running
+
 ### 0.21.3
 
 **Commit Delta**: [Change from 0.21.2 release](https://github.com/plus3it/watchmaker/compare/0.21.2...0.21.3)

azure-pipelines.yml

@@ -41,12 +41,6 @@ jobs:
 
 - job: build
   displayName: build standalone
-  dependsOn:
-  - py37_64
-  - py37_32
-  - py36_64
-  - py27_64
-  condition: succeeded()
   pool:
     vmImage: 'vs2017-win2016'
   variables:
@@ -64,24 +58,19 @@ jobs:
       versionSpec: $(py)
       architecture: $(architecture)
     name: buildPython
-  - script: $(buildPython.pythonLocation)\python -m pip install -r requirements/basics.txt
-    displayName: install python basics
-  - script: |
-      mkdir $(venv)
-      $(buildPython.pythonLocation)\python -m virtualenv $(venv)
-    displayName: setup virtual environment
   - ${{ if eq(variables['build.sourceBranch'], 'refs/heads/develop') }}:
     - powershell: |
         $ver = (git show -s --format=%cd --date=format:'%Y%m%d%H%M%S')
         (Get-Content setup.cfg) -replace '^(version = )(\d+\.\d+\.\d+).*$', ('$1$2.dev' + $ver) | Set-Content setup.cfg
       displayName: mark the version as development
+  - script: $(buildPython.pythonLocation)\python -m pip install -r requirements/basics.txt
+    displayName: install python basics
+  - script: $(buildPython.pythonLocation)\python -m virtualenv $(venv)
+    displayName: setup virtual environment
   - script: |
       call $(venv)\Scripts\activate.bat
-      python -m pip install -r requirements\pip.txt
-      python -m pip install -r requirements\build.txt
-      pip install --editable .
-      gravitybee --src-dir src --sha file --with-latest --extra-data static --extra-pkgs boto3 --extra-modules boto3
-    displayName: create standalone application
+      call ci/build.cmd
+    displayName: build standalone
   - script: move requirements\deploy.txt $(artifactDirFull)
     displayName: include requirements.txt for deploy
   - script: dir $(artifactDirFull)
@@ -123,7 +112,6 @@ jobs:
           inputs:
             awsCredentials: dev-lab
             targetFolder: $(keyPrefix)
-            #regionName: 'us-east-1' # should come from creds
             bucketName: $(devBucket)
             sourceFolder: $(artifactDirFull)\dist\
         - task: S3Upload@1
@@ -132,7 +120,6 @@ jobs:
           inputs:
             awsCredentials: dev-lab
             targetFolder: $(keyPrefix)
-            #regionName: 'us-east-1' # should come from creds
             bucketName: $(releaseBucket)
             sourceFolder: $(artifactDirFull)\dist\
         - script: |

ci/build.cmd

@@ -0,0 +1,16 @@
+python -m pip install -r requirements/pip.txt
+
+echo "-----------------------------------------------------------------------"
+python --version
+python -m pip --version
+echo "-----------------------------------------------------------------------"
+
+python -m pip install -r requirements/build.txt
+python -m pip install --editable .
+python -m pip list
+
+# creates standalone
+gravitybee --src-dir src --sha file --with-latest --extra-data static --extra-data ../vendor/pypa/get-pip/2.6 --extra-pkgs boto3 --extra-modules boto3
+
+call .gravitybee/gravitybee-environs.bat
+%GB_ENV_GEN_FILE_W_PATH% --version

ci/build.sh

@@ -2,16 +2,29 @@
 
 export VIRTUAL_ENV_DIR=venv
 
-virtualenv $VIRTUAL_ENV_DIR
+python3 -m ensurepip --upgrade --default-pip
+python3 -m pip install -r requirements/pip.txt
+python3 -m pip --version
+
+python3 -m pip install -r requirements/basics.txt
+python3 -m pip list
+
+virtualenv --python=python3 $VIRTUAL_ENV_DIR
 source $VIRTUAL_ENV_DIR/bin/activate
 
-pip install -r requirements/pip.txt
+python -m pip install -r requirements/pip.txt
+
 echo "-----------------------------------------------------------------------"
 python --version
-pip --version
+python -m pip --version
 echo "-----------------------------------------------------------------------"
-pip install -r requirements/build.txt
-pip install --editable .
+
+python -m pip install -r requirements/build.txt
+python -m pip install --editable .
+python -m pip list
 
 # creates standalone
 gravitybee --src-dir src --sha file --with-latest --extra-data static --extra-data ../vendor/pypa/get-pip/2.6 --extra-pkgs boto3 --extra-modules boto3
+
+source .gravitybee/gravitybee-environs.sh
+eval "$GB_ENV_GEN_FILE_W_PATH" --version

requirements/basics.txt

@@ -2,7 +2,7 @@ setuptools==36.8.0;python_version<="2.6"
 setuptools==43.0.0;python_version<="3.4" and python_version>="2.7"
 setuptools==50.3.2;python_version>"3.4"
 virtualenv==15.2.0;python_version<="2.6"
-virtualenv==20.0.35;python_version>="2.7"
+virtualenv==20.2.1;python_version>="2.7"
 wheel==0.29.0;python_version<="2.6"
 wheel==0.33.6;python_version<="3.4" and python_version>="2.7"
-wheel==0.35.1;python_version>"3.4"
+wheel==0.36.0;python_version>"3.4"

requirements/build.txt

@@ -1 +1 @@
-gravitybee==0.1.61
+gravitybee==0.1.63

requirements/check.txt

@@ -1,13 +1,13 @@
 -r docs-check.txt
 
-check-manifest==0.44
+check-manifest==0.45
 flake8==3.8.4
-flake8-bugbear==20.1.4
+flake8-bugbear==20.11.1
 flake8-builtins==1.5.3
 flake8-docstrings==1.5.0
 flake8-isort==4.0.0
 flake8-future-import==0.4.6
-flake8-print==3.1.4
+flake8-print==4.0.0
 isort==5.6.4
 m2r==0.2.1
 pep8-naming==0.11.1

requirements/deploy.txt

@@ -1 +1 @@
-satsuki==0.1.27
+satsuki==0.1.28

requirements/docs-check.txt

@@ -1 +1 @@
-pygments==2.7.1
+pygments==2.7.2

requirements/docs.txt

@@ -2,5 +2,5 @@
 
 recommonmark==0.6.0
 setuptools==50.3.2
-sphinx==3.2.1
+sphinx==3.3.0
 sphinx-rtd-theme==0.5.0

requirements/pip.txt

@@ -1,3 +1,3 @@
 pip==9.0.3;python_version<="2.6"
 pip==19.1;python_version<="3.4" and python_version>="2.7"
-pip==20.2.4;python_version>"3.4"
+pip==20.3.1;python_version>"3.4"

requirements/test.txt

@@ -3,7 +3,7 @@ mock==3.0.5;python_version<"3.6" and python_version>="2.7"
 mock==4.0.2;python_version>="3.6"
 pytest==3.2.5;python_version<"2.7" or python_version=="3.3"
 pytest==4.6.3;python_version<"3.5" and python_version>="2.7"
-pytest==6.1.1;python_version>="3.5"
+pytest==6.1.2;python_version>="3.5"
 pytest-travis-fold==1.3.0
 pytest-catchlog==1.2.2;python_version<"2.7"
 pytest-cov==2.5.1;python_version<"2.7"

setup.cfg

@@ -3,7 +3,7 @@
 [metadata]
 name = watchmaker
 description = Applied Configuration Management
-version = 0.21.3
+version = 0.21.4
 long_description = file: README.md, CHANGELOG.md
 long_description_content_type = text/markdown
 author = Plus3IT Maintainers of Watchmaker