mite 2.0.0__tar.gz → 2.0.2__tar.gz

{mite-2.0.0 → mite-2.0.2}/.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.10.1
+    rev: 5.12.0
     hooks:
     - id: isort
       files: .*.py$

{mite-2.0.0/mite.egg-info → mite-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mite
-Version: 2.0.0
+Version: 2.0.2
 Summary: A Python Performance Testing Framework
 Home-page: https://github.com/sky-uk/mite/
 Classifier: License :: OSI Approved :: MIT License

{mite-2.0.0 → mite-2.0.2}/cd-scripts/cdRelease.py

@@ -128,19 +128,17 @@ def main():
         else:
             commit_message = repo.git.log("--format=%B", n=1)
             matches = re.findall(r"^.*\(#(\d+)\)$", commit_message, re.MULTILINE)
-            version_parts_to_increment = parse_pr(matches[0])
+            version_parts_to_increment = parse_pr(matches[0]) if len(matches) else None
 
         if not version_parts_to_increment:
             logger.info("No release")
-            with open("/tmp/workspace/env_vars", "a") as f:
-                f.write("export VERSION_INCREMENT=false")
-            sys.exit(0)
+            sys.exit(1)
+
         new_tag = increment_version_from_pr(
             current_latest_version, version_parts_to_increment
         )
 
     create_and_push_tag(repo, new_tag)
-
     sys.exit(0)
 
 

mite-2.0.2/cd-scripts/cdTagRelease.sh

@@ -0,0 +1,73 @@
+#!/bin/bash
+
+function tagBuild() {   
+    git config user.email "mite@noreply.github.com"
+    git config user.name "Jenkins-CI"
+    pip3 install docopt GitPython packaging requests
+    python3 cd-scripts/cdRelease.py
+    if (( $? == 1)); then
+        VERSION_INCREMENT=false
+    fi
+}
+
+function checkAcurl() {
+    ACURL_CHANGED=false
+
+    if [[ -n $(git show --name-only ${CD_VCS_REF} ./acurl) ]]; then
+        echo "Acurl has changed"
+        ACURL_CHANGED=true
+        LATEST_ACURL_VERSION=$(curl -s https://pypi.org/pypi/acurl/json | jq -r '.info .version')
+        if [[ -n $(grep "version = $LATEST_ACURL_VERSION$" acurl/setup.cfg) ]]; then
+        echo "Acurl has changed, but the version of acurl hasn't changed"
+        exit 1
+        fi
+    fi
+}
+
+function buildLinuxWheels() {
+    
+    CIBW_BEFORE_ALL_LINUX="yum install -y libcurl-devel || apt-get install -y libcurl-dev || apk add curl-dev"
+    CIBW_SKIP="*i686"
+
+    if [ "$VERSION_INCREMENT" = false ]; then
+        echo "Mite version not incremented, not building"
+    else
+        echo "##### Building Mite #####"
+        pip3 install --user cibuildwheel==2.8.1 build twine
+        python3 -m build --outdir ./wheelhouse
+    fi
+    if [ "$ACURL_CHANGED" = true ]; then
+        echo "##### Building Acurl #####"
+        cd acurl
+        pip3 install --user cibuildwheel==2.8.1 build Cython twine
+        python3 -m build --sdist --outdir ../wheelhouse
+        cd ../
+    fi
+}
+
+function initPypirc() {
+    echo -e "[pypi]" > ~/.pypirc
+    echo -e "username = __token__" >> ~/.pypirc
+    echo -e "password = $PYPI_TOKEN" >> ~/.pypirc
+}
+
+###### MAIN SECTION ######
+
+echo "##### Starting tag process and check for version increment #####"
+tagBuild
+
+echo "##### Look for Acurl changes #####"
+checkAcurl
+
+echo "##### Build Linux-Wheels #####"
+buildLinuxWheels
+
+if [ "$VERSION_INCREMENT" = false ]; then
+        echo "Mite version not incremented, nothing to upload"
+else
+    echo "##### Init .pypirc #####"
+    initPypirc
+
+    echo "##### Upload package #####"
+    python3 -m twine upload wheelhouse/*
+fi

mite-2.0.2/cd-scripts/runTests.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+function isOnMaster() {
+    current_revision=$(git rev-parse HEAD)
+    branch=$(git branch -r --contains $current_revision)
+    set +e
+    echo "$branch" | grep -q "origin/master$"
+    result=$?
+    set -e
+    return ${result}
+}
+
+
+echo "##### Run pre-commit checks #####"
+/home/jenkins/.local/bin/pre-commit run --origin HEAD --source origin/master
+PRE_COMMIT_STATUS=$?
+
+if [ $PRE_COMMIT_STATUS -ne 0 ]; then
+    git diff
+fi
+
+echo "##### Run tests with tox #####"
+tox; TOX_EXIT_CODE=$?
+[ "$TOX_EXIT_CODE" -eq 0 -a "$PRE_COMMIT_STATUS" -eq 0 ] || exit 1
+
+if isOnMaster ; then
+    echo "##### Job running on MASTER. Proceeding with the Tag and Release script. ######"
+    ./cd-scripts/cdTagRelease.sh
+else
+    echo "###### Job running on a Branch. Stopping here. ######"
+fi

{mite-2.0.0 → mite-2.0.2}/cd.yml

@@ -1,9 +1,20 @@
 version: 1
-context: identity
+
+# Further ideas for jobs to run:
+# - license check
+# - make sure test coverage increases
+# - merge all tox tests into one using pyenv
+# And, once we're sure that the pipeline is working:
+# - integration/performance tests
+# Once we have docs:
+# - documentation coverage
+# - docs build (on master only)
+
+context: sky-identity
 triggering: multibranch
 
 defaultNodes:
-  default: id-mite-slave
+  default: sky-identity-nonprod-mite-slave-buildkit
 
 modules:
   mite-ci:

{mite-2.0.0 → mite-2.0.2}/dev-requirements.txt

@@ -3,5 +3,5 @@ keyring~=19.0.2
 tox~=3.14.2
 pre-commit~=2.20.0
 flake8~=3.7.8
-black~=22.3.0
+black~=22.4.2
 coverage~=5.1

{mite-2.0.0 → mite-2.0.2/mite.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mite
-Version: 2.0.0
+Version: 2.0.2
 Summary: A Python Performance Testing Framework
 Home-page: https://github.com/sky-uk/mite/
 Classifier: License :: OSI Approved :: MIT License

{mite-2.0.0 → mite-2.0.2}/mite.egg-info/SOURCES.txt

@@ -22,12 +22,13 @@ setup.py
 test-requirements.txt
 test.har
 tox.ini
-.circleci/config.yml
 .github/pull_request_template.md
 .github/ISSUE_TEMPLATE/bug_report.md
 .github/ISSUE_TEMPLATE/feature_request.md
 cd-scripts/cdBuild-1.sh
 cd-scripts/cdRelease.py
+cd-scripts/cdTagRelease.sh
+cd-scripts/runTests.sh
 docs/Makefile
 docs/components.rst
 docs/conf.py

{mite-2.0.0 → mite-2.0.2}/test-requirements.txt

@@ -13,4 +13,5 @@ pytest-cov
 pytest-httpbin
 pytest-httpserver
 sanic
-werkzeug==2.0.3
+werkzeug==3.0.3
+uvloop==0.19.0

{mite-2.0.0 → mite-2.0.2}/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py39, py310, py311
+envlist = py310, py311
 skipsdist = true
 
 [testenv]

mite-2.0.0/.circleci/config.yml

@@ -1,184 +0,0 @@
-version: 2.1
-
-# Further ideas for jobs to run:
-# - license check
-# - make sure test coverage increases
-# - merge all tox tests into one using pyenv
-# And, once we're sure that the pipeline is working:
-# - integration/performance tests
-# Once we have docs:
-# - documentation coverage
-# - docs build (on master only)
-
-workflows:
-  mite:
-    jobs:
-      - check-acurl-version
-      - build:
-          requires:
-            - check-acurl-version
-      - tag:
-          requires:
-            - build
-          filters:
-            branches:
-              only: master
-      - linux-wheels:
-          requires:
-            - tag
-          filters:
-            branches:
-              only: master
-      - osx-wheels:
-          requires:
-            - tag
-          filters:
-            branches:
-              only: master
-
-
-jobs:
-
-  check-acurl-version:
-    docker:
-      - image: python:3.11.2
-    steps:
-      - checkout
-      - run:
-          command: |
-            ACURL_CHANGED=false
-            if [[ -n $(git show --name-only ${CIRCLE_SHA1} ./acurl) ]]; then
-              echo "Acurl has changed"
-              apt-get update && apt-get install -y jq
-              ACURL_CHANGED=true
-              LATEST_ACURL_VERSION=$(curl -s https://pypi.org/pypi/acurl/json | jq -r '.info .version')
-              if [[ -n $(grep "version = $LATEST_ACURL_VERSION$" acurl/setup.cfg) ]]; then
-                echo "Acurl has changed, but the version of acurl hasn't changed"
-                exit 1
-              fi
-            fi
-            mkdir -p /tmp/workspace
-            echo "export ACURL_CHANGED=\"$ACURL_CHANGED\"" >> /tmp/workspace/env_vars
-      - persist_to_workspace:
-          root: /tmp/workspace
-          paths:
-            - env_vars
-
-  build:
-    docker:
-      - image: python:3.11.2
-    environment:
-      PYENV_ROOT: /root/.pyenv
-      PYTHON_VERSION: 3.11.2
-      PIPENV_DEFAULT_PYTHON_VERSION: 3.11.2
-    steps:
-      - checkout
-      - run:
-          name: Install pyenv, run tox
-          command: |
-            echo 'export PATH="/root/.pyenv/shims:/root/.pyenv/bin:$PATH"' >> "$BASH_ENV"
-            source "$BASH_ENV"
-            curl https://pyenv.run | bash
-            for version in 3.9.16 3.10.10 3.11.2; do
-              pyenv install $version
-            done
-            pyenv local 3.11.2 3.10.10 3.9.16
-            pip install tox
-            tox
-
-  tag:
-    docker:
-      - image: python:3.11.2
-    steps:
-      - add_ssh_keys:
-          fingerprints:
-            - "fc:39:a2:b8:32:23:52:a5:fe:45:b6:9b:12:e7:30:2a"
-      - checkout
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: tag github version
-          command: |
-            git config user.email "mite@noreply.github.com"
-            git config user.name "CircleCI"
-            pip3 install docopt GitPython packaging requests
-            python3 cd-scripts/cdRelease.py
-      - persist_to_workspace:
-          root: /tmp/workspace
-          paths:
-            - env_vars
-
-  linux-wheels:
-    # we only need to build the 'mite' wheels on one platform
-    # so we only need to run `python3 -m build` in this job
-    working_directory: ~/linux-wheels
-    docker:
-      - image: python:3.11.2
-    environment:
-      CIBW_BEFORE_ALL_LINUX: "yum install -y libcurl-devel || apt-get install -y libcurl-dev || apk add curl-dev"
-      CIBW_SKIP: "*i686"
-    steps:
-      - checkout
-      - setup_remote_docker
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: Build the Linux wheels.
-          command: |
-            source /tmp/workspace/env_vars
-            if [ "$VERSION_INCREMENT" = false ]; then
-              echo "Mite version not incremented, not building"
-            else
-              pip3 install --user cibuildwheel==2.8.1 build twine
-              python3 -m build --outdir ./wheelhouse
-            fi
-            if [ "$ACURL_CHANGED" = true ]; then
-              cd acurl
-              pip3 install --user cibuildwheel==2.8.1 build Cython twine
-              python3 -m build --sdist --outdir ../wheelhouse
-            fi
-      - run:
-          name: init .pypirc
-          command: |
-            echo -e "[pypi]" >> ~/.pypirc
-            echo -e "username = __token__" >> ~/.pypirc
-            echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc
-      - run:
-          name: upload packages to pypi
-          command: /root/.local/bin/twine upload wheelhouse/*
-      - store_artifacts:
-          path: wheelhouse/
-
-  osx-wheels:
-    working_directory: ~/osx-wheels
-    macos:
-      # https://circleci.com/docs/testing-ios#supported-xcode-versions
-      xcode: 12.5.1
-    steps:
-      - checkout
-      - attach_workspace:
-          at: /tmp/workspace
-      - run:
-          name: Build the OS X wheels.
-          command: |
-            source /tmp/workspace/env_vars
-            if [ "$ACURL_CHANGED" = true ]; then
-              pip3 install cibuildwheel==2.8.1 Cython twine
-              cd acurl
-              cibuildwheel --output-dir ../wheelhouse --archs x86_64,arm64
-            fi
-      - run:
-          name: init .pypirc
-          command: |
-            echo -e "[pypi]" >> ~/.pypirc
-            echo -e "username = __token__" >> ~/.pypirc
-            echo -e "password = $PYPI_PASSWORD" >> ~/.pypirc
-      - run:
-          name: upload packages to pypi
-          command: |
-            source /tmp/workspace/env_vars
-            if [ "$ACURL_CHANGED" = true ]; then
-              twine upload wheelhouse/*
-            fi
-      - store_artifacts:
-          path: wheelhouse/