CircleCI

.circleci/config.yml

@@ -0,0 +1,268 @@
+version: 2.1
+orbs:
+  windows: circleci/[email protected]
+jobs:
+  sdist:
+    docker:
+    - image: python:3.8
+    steps:
+    - checkout
+    - run:
+        name: Build
+        command: |-
+          python -m pip install --quiet --upgrade pip
+          python -m pip install --quiet --upgrade pep517
+          python -m pep517.build --source --out-dir dist/ .
+    - store_artifacts:
+        path: dist
+    - persist_to_workspace:
+        root: .
+        paths:
+        - dist
+  bdist:
+    docker:
+    - image: python:3.8
+    steps:
+    - checkout
+    - run:
+        name: Build
+        command: |-
+          python -m pip install --quiet --upgrade pip
+          python -m pip install --quiet --upgrade pep517
+          python -m pep517.build --binary --out-dir dist/ .
+    - store_artifacts:
+        path: dist
+    - persist_to_workspace:
+        root: .
+        paths:
+        - dist
+  pyenv_macos_cpython_3_8:
+    macos:
+      xcode: 10.0.0
+    steps:
+    - run:
+        name: Install pyenv support libraries
+        command: |-
+          # brew update
+          brew list readline &>/dev/null || brew install readline
+          brew list xz &>/dev/null || brew install xz
+    - run:
+        name: Configure pyenv
+        command: echo 'export PYENV_ROOT=${PWD}/.ciborg/pyenv' >> $BASH_ENV
+    - restore_cache:
+        key: pyenv_macos_cpython_3_8-v3
+    - run:
+        name: Install pyenv
+        command: |-
+          if [ ! -e .ciborg/pyenv ]; then curl https://pyenv.run | bash; fi
+          echo 'export PATH=${PYENV_ROOT}/bin:${PATH}' >> $BASH_ENV
+          echo 'export PATH=${PYENV_ROOT}/shims:${PATH}' >> $BASH_ENV
+          # echo 'eval '$(pyenv init -)"' >> $BASH_ENV
+          # echo 'export CFLAGS=-I$(brew --prefix openssl)/include' >> $BASH_ENV
+          # echo 'export LDFLAGS=-L$(brew --prefix openssl)/lib' >> $BASH_ENV
+          echo ----
+          cat $BASH_ENV
+          echo ----
+    - run:
+        name: Install CPython 3.8
+        command: |-
+          echo $PATH
+          ls ${PYENV_ROOT} || true
+          ls ${PYENV_ROOT}/bin || true
+          ls ${PYENV_ROOT}/shims || true
+          pyenv --help
+          pyenv install --list
+          set -vx
+          export CIBORG_PYTHON_VERSION=$(pyenv install --list | sort | sed -n 's/^ *\(3.8[^ ]*\)/\1/p' | grep -v 'dev' | tail -n 1)
+          echo ${CIBORG_PYTHON_VERSION}
+          pyenv install --skip-existing ${CIBORG_PYTHON_VERSION}
+          pyenv global ${CIBORG_PYTHON_VERSION}
+    - save_cache:
+        key: pyenv_macos_cpython_3_8-v3
+        paths:
+        - .ciborg/pyenv
+  pyenv_windows_cpython_3_8:
+    executor:
+      name: windows/default
+      shell: bash
+    steps:
+    - run:
+        name: Configure pyenv
+        command: echo 'export PYENV_ROOT=${PWD}/.ciborg/pyenv' >> $BASH_ENV
+    - restore_cache:
+        key: pyenv_windows_cpython_3_8-v6
+    - run:
+        name: Install pyenv
+        command: |-
+          if [ ! -e ${PYENV_ROOT} ]; then git clone https://github.com/pyenv-win/pyenv-win pyenv-win; mkdir -p $(dirname ${PYENV_ROOT}); mv pyenv-win/pyenv-win ${PYENV_ROOT}; fi
+          echo 'export PATH=${PYENV_ROOT}/bin:${PATH}' >> $BASH_ENV
+          echo 'export PATH=${PYENV_ROOT}/shims:${PATH}' >> $BASH_ENV
+          echo ----
+          cat $BASH_ENV
+          echo ----
+    - run:
+        name: Install CPython 3.8
+        command: |-
+          echo $PATH
+          ls ${PYENV_ROOT} || true
+          ls ${PYENV_ROOT}/bin || true
+          ls ${PYENV_ROOT}/shims || true
+          pyenv --help
+          pyenv install --list
+          set -vx
+          export CIBORG_PYTHON_VERSION=$(pyenv install --list | sort | sed -n 's/^ *\(3.8[^ ]*\)/\1/p' | grep -v 'dev' | tail -n 1)
+          echo ${CIBORG_PYTHON_VERSION}
+          pyenv install --skip-existing ${CIBORG_PYTHON_VERSION}
+          pyenv global ${CIBORG_PYTHON_VERSION}
+    - save_cache:
+        key: pyenv_windows_cpython_3_8-v6
+        paths:
+        - .ciborg/pyenv
+  tox_typehints_linux_cpython_3_8:
+    docker:
+    - image: python:3.8
+    environment:
+      TOXENV: typehints
+    steps:
+    - checkout
+    - run:
+        name: Tox
+        command: |-
+          python -m pip install --quiet --upgrade pip setuptools wheel
+          python -m pip install tox
+          python -m tox
+  tox_linux_cpython_3_6_bdist:
+    docker:
+    - image: python:3.6
+    environment:
+      TOXENV: py36
+    steps:
+    - checkout
+    - attach_workspace:
+        at: .
+    - run:
+        name: Select distribution file
+        command: |-
+          ls ${PWD}/dist/*
+          echo "export DIST_FILE_PATH=$(ls ${PWD}/dist/*.whl)" >> $BASH_ENV
+    - run:
+        name: Tox
+        command: |-
+          python -m pip install --quiet --upgrade pip setuptools wheel
+          python -m pip install tox
+          python -m tox --installpkg="${DIST_FILE_PATH}"
+  tox_linux_cpython_3_8_sdist:
+    docker:
+    - image: python:3.8
+    environment:
+      TOXENV: py38
+    steps:
+    - checkout
+    - attach_workspace:
+        at: .
+    - run:
+        name: Select distribution file
+        command: |-
+          ls ${PWD}/dist/*
+          echo "export DIST_FILE_PATH=$(ls ${PWD}/dist/*.tar.gz)" >> $BASH_ENV
+    - run:
+        name: Tox
+        command: |-
+          python -m pip install --quiet --upgrade pip setuptools wheel
+          python -m pip install tox
+          python -m tox --installpkg="${DIST_FILE_PATH}"
+  tox_linux_cpython_3_8_bdist:
+    docker:
+    - image: python:3.8
+    environment:
+      TOXENV: py38
+    steps:
+    - checkout
+    - attach_workspace:
+        at: .
+    - run:
+        name: Select distribution file
+        command: |-
+          ls ${PWD}/dist/*
+          echo "export DIST_FILE_PATH=$(ls ${PWD}/dist/*.whl)" >> $BASH_ENV
+    - run:
+        name: Tox
+        command: |-
+          python -m pip install --quiet --upgrade pip setuptools wheel
+          python -m pip install tox
+          python -m tox --installpkg="${DIST_FILE_PATH}"
+  tox_macos_cpython_3_8_bdist:
+    macos:
+      xcode: 10.0.0
+    environment:
+      TOXENV: py38
+    steps:
+    - checkout
+    - attach_workspace:
+        at: .
+    - run:
+        name: Select distribution file
+        command: |-
+          ls ${PWD}/dist/*
+          echo "export DIST_FILE_PATH=$(ls ${PWD}/dist/*.whl)" >> $BASH_ENV
+    - run:
+        name: Configure pyenv
+        command: |-
+          echo 'export PYENV_ROOT=${PWD}/.ciborg/pyenv' >> $BASH_ENV
+          echo 'export PATH=${PYENV_ROOT}/bin:${PATH}' >> $BASH_ENV
+          echo 'export PATH=${PYENV_ROOT}/shims:${PATH}' >> $BASH_ENV
+    - restore_cache:
+        key: pyenv_macos_cpython_3_8-v3
+    - run:
+        name: Tox
+        command: |-
+          python -m pip install --quiet --upgrade pip setuptools wheel
+          python -m pip install tox
+          python -m tox --installpkg="${DIST_FILE_PATH}"
+  tox_windows_cpython_3_8_bdist:
+    executor:
+      name: windows/default
+      shell: bash
+    environment:
+      TOXENV: py38
+    steps:
+    - checkout
+    - attach_workspace:
+        at: .
+    - run:
+        name: Select distribution file
+        command: |-
+          ls ${PWD}/dist/*
+          echo "export DIST_FILE_PATH=$(ls ${PWD}/dist/*.whl)" >> $BASH_ENV
+    - run:
+        name: Tox
+        command: |-
+          python -m pip install --quiet --upgrade pip setuptools wheel
+          python -m pip install tox
+          python -m tox --installpkg="${DIST_FILE_PATH}"
+workflows:
+  version: 2
+  all:
+    jobs:
+    - sdist
+    - bdist
+    - pyenv_macos_cpython_3_8
+    - pyenv_windows_cpython_3_8
+    - tox_typehints_linux_cpython_3_8
+    - tox_linux_cpython_3_6_bdist:
+        requires:
+        - bdist
+    - tox_linux_cpython_3_8_sdist:
+        requires:
+        - sdist
+    - tox_linux_cpython_3_8_bdist:
+        requires:
+        - bdist
+    - tox_macos_cpython_3_8_bdist:
+        requires:
+        - pyenv_macos_cpython_3_8
+        - bdist
+    - tox_windows_cpython_3_8_bdist:
+        requires:
+        - pyenv_windows_cpython_3_8
+        - bdist

src/ciborg/azure.py

@@ -647,11 +647,6 @@ class Trigger:
     paths = attr.ib(factory=IncludeExcludePVectors)
 
 
-class OrderedDictField(marshmallow.fields.Mapping):
-    # https://github.com/marshmallow-code/marshmallow/pull/1098
-    mapping_type = collections.OrderedDict
-
-
 class UsePythonVersionTaskStepSchema(marshmallow.Schema):
     class Meta:
         ordered = True