Remove azure pipelines

Signed-off-by: Dan Yeaw <dan@yeaw.me>

.github/workflows/build.yml

@@ -36,43 +36,50 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.7
+          python-version: 3.8
       - name: Install Ubuntu dependencies
         run: >
-          sudo apt-get update -q && sudo apt-get install --no-install-recommends -y
+          sudo apt-get update -q && sudo apt-get install
-          python3-dev python3-gi python3-gi-cairo gir1.2-gtk-3.0 libgirepository1.0-dev libcairo2-dev
+          --no-install-recommends -y xvfb python3-dev python3-gi
-      - name: Install Python dependencies
+          python3-gi-cairo gir1.2-gtk-3.0 libgirepository1.0-dev libcairo2-dev
-        run: |
+      - name: Install Python Dependencies
-          source venv
+        run: source venv
       - name: Test with pytest
         run: |
           source venv
-          xvfb-run coverage run -m pytest
+          xvfb-run pytest
+      - name: Code Climate Coverage Action
+        uses: paambaati/codeclimate-action@v2.3.0
+        env:
+          CC_TEST_REPORTER_ID: 05f6288b94a87daa172d3e96a33ec331a4374be7d01eb9a42b3b21c4c550a8ff
+        with:
+          coverageCommand: poetry run coverage xml
   test-windows:
     needs: lint
-    runs-on: [windows]
+    runs-on: windows-latest
     env:
-      MSYS2_ARCH: x86_64
       MSYSTEM: MINGW64
-      CHERE_INVOKING: yes
+      MSYS2_ARCH: x86_64
     steps:
       - uses: actions/checkout@v1
-      - uses: numworks/setup-msys2@v1
       - name: Install MSYS2
         run: |
-          choco install msys2 --params="/InstallDir:%CD:~0,2%\msys64 /NoUpdate /NoPath"
+          choco install msys2 --params="/NoUpdate /NoPath"
-          set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
+          $env:PATH = "C:\tools\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem"
-          %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu
+          C:\tools\msys64\usr\bin\pacman --noconfirm -Syyuu
-          %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syuu
+          C:\tools\msys64\usr\bin\pacman --noconfirm -Syuu
       - name: Install Dependencies
         run: |
-          set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
+          $env:PATH = "C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem"
-          %CD:~0,2%\msys64\usr\bin\bash -lc ".azure/msys2-install.sh"
+          C:\tools\msys64\usr\bin\bash -lc ".azure/msys2-install.sh"
+        env:
+          CHERE_INVOKING: yes
       - name: Run Tests
         run: |
-          set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
+          $env:PATH = "C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem"
-          %CD:~0,2%\msys64\usr\bin\bash -lc ".azure/msys2-test.sh"
+          C:\tools\msys64\usr\bin\bash -lc ".azure/msys2-test.sh"
         env:
+          CHERE_INVOKING: yes
           PY_IGNORE_IMPORTMISMATCH: yes
   test-macos:
     needs: lint

.github/workflows/publish.yml

@@ -1,9 +1,7 @@
 name: Upload Python Package
-
 on:
   release:
     types: published
-
 jobs:
   deploy:
     runs-on: ubuntu-latest
@@ -13,14 +11,11 @@ jobs:
       uses: actions/setup-python@v1
       with:
         python-version: '3.x'
-    - name: Install dependencies
+    - name: Install Poetry
-      run: |
+      uses: dschep/install-poetry-action@v1.2
-        python -m pip install --upgrade pip
+    - name: Install Dependencies
-        pip install poetry
+      run: poetry install
     - name: Build and publish
-      env:
-        POETRY_USERNAME: ${{ secrets.PYPI_USERNAME }}
-        POETRY_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
         poetry build
-        poetry publish -u POETRY_USERNAME -p POETRY_PASSWORD
+        poetry publish -u ${{ secrets.PYPI_USERNAME }} -p ${{ secrets.PYPI_PASSWORD }}

azure-pipelines.yml

@@ -1,235 +0,0 @@
-trigger:
-  branches:
-    include:
-      - '*'
-      - refs/tags/*
-
-variables:
-  System.Debug: true
-
-jobs:
-  - job: Lint
-    pool:
-      vmImage: ubuntu-16.04
-    steps:
-      - task: UsePythonVersion@0
-        inputs:
-          versionSpec: '3.7'
-          architecture: 'x64'
-
-      - script: |
-          pip install pre-commit
-          pre-commit install-hooks
-          pre-commit run --all-files
-
-          # flake8 pre-commit hook is causing errors
-          # try again once new version of pyflakes is released (> 2.1.1)
-          pip install git+https://github.com/PyCQA/pyflakes.git@1911c203a13826d2eb03d582d60874b91e36f4fc --upgrade
-          pip install flake8==3.7.9
-          flake8 gaphor
-
-  - job: Windows
-    dependsOn: Lint
-    condition: succeeded()
-    pool:
-      vmImage: vs2017-win2016
-    variables:
-      MSYSTEM: MINGW64
-      MSYS2_ARCH: x86_64
-
-    steps:
-      - script: |
-          choco install msys2 --params="/InstallDir:%CD:~0,2%\msys64 /NoUpdate /NoPath"
-          set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-          %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu
-          %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syuu
-        displayName: Install MSYS2
-
-      - script: |
-          set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-          %CD:~0,2%\msys64\usr\bin\bash -lc ".azure/msys2-install.sh"
-        displayName: Install Dependencies
-        env:
-          MSYS2_ARCH: $(MSYS2_ARCH)
-          MSYSTEM: $(MSYSTEM)
-          CHERE_INVOKING: yes
-
-      - script: |
-          set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-          %CD:~0,2%\msys64\usr\bin\bash -lc ".azure/msys2-test.sh"
-        displayName: Run Tests
-        env:
-          MSYSTEM: $(MSYSTEM)
-          CHERE_INVOKING: yes
-          PY_IGNORE_IMPORTMISMATCH: yes
-
-      - task: PublishTestResults@2
-        condition: not(canceled())
-        inputs:
-          testResultsFiles: junit\test-results.xml
-          testRunTitle: Publish Test Results
-
-      - script: |
-          set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
-          %CD:~0,2%\msys64\usr\bin\bash -lc ".azure/msys2-build.sh"
-        displayName: Create Windows Binaries
-        condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-        env:
-          MSYSTEM: $(MSYSTEM)
-          CHERE_INVOKING: yes
-
-      - task: CopyFiles@2
-        displayName: Copy Windows Packages to Staging
-        condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-        inputs:
-          sourceFolder: $(Build.SourcesDirectory)/win-installer
-          contents: '*.exe'
-          targetFolder: $(Build.ArtifactStagingDirectory)
- 
-      - task: PublishPipelineArtifact@1
-        displayName: Add Windows Package to Pipeline
-        condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-        inputs:
-          targetPath: $(Build.ArtifactStagingDirectory)
-          artifactName: WindowsExe
-
-  - job: macOS
-    dependsOn: Lint
-    condition: succeeded()
-    pool:
-      vmImage: 'macOS-10.13'
-    variables:
-        PKG_CONFIG_PATH: /usr/local/Cellar/libffi/3.2.1/lib/pkgconfig:${PKG_CONFIG_PATH:-}
-    steps:
-    - script: |
-        brew install gobject-introspection gtk+3 adwaita-icon-theme
-        source venv
-        pip install pytest-xvfb
-      displayName: 'Install dependencies'
-
-    - script: |
-        source venv
-        pytest
-      displayName: 'PyTest'
-      env:
-        PYTEST_ADDOPTS: "--doctest-modules --junitxml=junit/test-results.xml"
-
-    - script: |
-        cd macos-dmg
-        ./package.sh
-      displayName: Create macOS Package
-      condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-
-    - task: CopyFiles@2
-      displayName: Copy macOS Package to Staging
-      condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-      inputs:
-        sourceFolder: $(Build.SourcesDirectory)/macos-dmg
-        contents: '*.dmg'
-        TargetFolder: $(Build.ArtifactStagingDirectory)
-
-    - task: PublishPipelineArtifact@1
-      displayName: Add macOS Package to Pipeline
-      condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-      inputs:
-        targetPath: $(Build.ArtifactStagingDirectory)
-        artifactName: MacDmg
-
-  - job: Linux
-    dependsOn: Lint
-    condition: succeeded()
-    pool:
-      vmImage: 'ubuntu-16.04'
-
-    steps:
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.7'
-        architecture: 'x64'
-
-    - script: >
-        sudo apt-get update -q && sudo apt-get install --no-install-recommends -y
-        python3-dev python3-gi python3-gi-cairo gir1.2-gtk-3.0 libgirepository1.0-dev libcairo2-dev
-      displayName: Install Ubuntu Dependencies
-
-    - script: |
-        source venv
-      displayName: Install Python Dependencies
-
-    - script: |
-        source venv
-        xvfb-run pytest
-      displayName: 'PyTest'
-      env:
-        PYTEST_ADDOPTS: "--doctest-modules --junitxml=junit/test-results.xml"
-
-
-    - task: PublishTestResults@2
-      condition: not(canceled())
-      inputs:
-        testResultsFiles: junit/test-results.xml
-        testRunTitle: Publish Test Results
-
-    - script: |
-        source venv
-        poetry build
-      displayName: Build Wheel
-
-    - task: CopyFiles@2
-      displayName: Copy sdist and Wheel Package to Staging
-      condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-      inputs:
-        sourceFolder: $(Build.SourcesDirectory)/dist
-        contents: '*'
-        TargetFolder: $(Build.ArtifactStagingDirectory)
-
-    - task: PublishPipelineArtifact@1
-      displayName: Add sdist and Wheel to Pipeline
-      condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-      inputs:
-        targetPath: $(Build.ArtifactStagingDirectory)
-        artifactName: Wheel
-    
-    - script: |
-        poetry config repositories.azure https://pkgs.dev.azure.com/gaphor-dev/_packaging/PyPI-Feed/pypi/upload
-        poetry config http-basic.azure $(username) $(password)
-        poetry publish -r azure
-        exit 0
-      displayName: Publish software
-  
-  - job: Release
-    dependsOn:
-    - macOS
-    - Windows
-    - Linux
-    condition: and(succeeded(), contains(variables['Build.SourceBranch'], 'refs/tags/'))
-    pool:
-      vmImage: 'ubuntu-16.04'
-    steps:
-      - task: DownloadPipelineArtifact@2
-
-      - task: CopyFiles@2
-        displayName: Copy Pipeline Artifacts to Staging
-        inputs:
-          sourceFolder: $(Pipeline.Workspace)
-          contents: |
-            WindowsExe/*.exe
-            MacDmg/*.dmg
-            Wheel/*.*
-          TargetFolder: $(Build.ArtifactStagingDirectory)
-
-      - task: GitHubRelease@0
-        displayName: Create GitHub Release
-        inputs:
-          gitHubConnection: GaphorConnection
-          repositoryName: gaphor/gaphor
-          action: create
-          tagSource: auto
-          target: $(Build.SourceVersion)
-          addChangeLog: false
-          assets: |
-            $(Build.ArtifactStagingDirectory)/WindowsExe/*.exe
-            $(Build.ArtifactStagingDirectory)/MacDmg/*.dmg
-            $(Build.ArtifactStagingDirectory)/Wheel/*.whl
-            $(Build.ArtifactStagingDirectory)/Wheel/*.tar.gz
-          isDraft: true

flatpak/flatpak-builder-tools

@@ -1 +1 @@
-Subproject commit 03ea8898855e0524f7abaf92b16809af1489a170
+Subproject commit 195ff914cc891baeec2b2e29772a89fe73c0a2e2

poetry.lock

@@ -37,6 +37,7 @@ pyyaml = "*"
 [[package]]
 category = "dev"
 description = "Atomic file writes."
+marker = "sys_platform == \"win32\""
 name = "atomicwrites"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
@@ -375,7 +376,7 @@ description = "plugin and hook calling mechanisms for python"
 name = "pluggy"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
-version = "0.13.0"
+version = "0.13.1"
 
 [package.dependencies]
 [package.dependencies.importlib-metadata]
@@ -484,7 +485,7 @@ description = "pytest: simple powerful testing with Python"
 name = "pytest"
 optional = false
 python-versions = ">=3.5"
-version = "5.2.4"
+version = "5.3.0"
 
 [package.dependencies]
 atomicwrites = ">=1.0"
@@ -761,7 +762,7 @@ description = "Virtual Python Environment builder"
 name = "virtualenv"
 optional = false
 python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
-version = "16.7.7"
+version = "16.7.8"
 
 [package.extras]
 docs = ["sphinx (>=1.8.0,<2)", "towncrier (>=18.5.0)", "sphinx-rtd-theme (>=0.4.2,<1)"]
@@ -1005,8 +1006,8 @@ pathspec = [
     {file = "pathspec-0.6.0.tar.gz", hash = "sha256:e285ccc8b0785beadd4c18e5708b12bb8fcf529a1e61215b3feff1d1e559ea5c"},
 ]
 pluggy = [
-    {file = "pluggy-0.13.0-py2.py3-none-any.whl", hash = "sha256:0db4b7601aae1d35b4a033282da476845aa19185c1e6964b25cf324b5e4ec3e6"},
+    {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"},
-    {file = "pluggy-0.13.0.tar.gz", hash = "sha256:fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34"},
+    {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"},
 ]
 pre-commit = [
     {file = "pre_commit-1.20.0-py2.py3-none-any.whl", hash = "sha256:c2e4810d2d3102d354947907514a78c5d30424d299dc0fe48f5aa049826e9b50"},
@@ -1042,8 +1043,8 @@ pyparsing = [
     {file = "pyparsing-2.4.5.tar.gz", hash = "sha256:4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a"},
 ]
 pytest = [
-    {file = "pytest-5.2.4-py3-none-any.whl", hash = "sha256:8e256fe71eb74e14a4d20a5987bb5e1488f0511ee800680aaedc62b9358714e8"},
+    {file = "pytest-5.3.0-py3-none-any.whl", hash = "sha256:f6a567e20c04259d41adce9a360bd8991e6aa29dd9695c5e6bd25a9779272673"},
-    {file = "pytest-5.2.4.tar.gz", hash = "sha256:ff0090819f669aaa0284d0f4aad1a6d9d67a6efdc6dd4eb4ac56b704f890a0d6"},
+    {file = "pytest-5.3.0.tar.gz", hash = "sha256:1897d74f60a5d8be02e06d708b41bf2445da2ee777066bd68edf14474fc201eb"},
 ]
 pytest-cov = [
     {file = "pytest-cov-2.8.1.tar.gz", hash = "sha256:cc6742d8bac45070217169f5f72ceee1e0e55b0221f54bcf24845972d3a47f2b"},
@@ -1176,8 +1177,8 @@ urllib3 = [
     {file = "urllib3-1.25.7.tar.gz", hash = "sha256:f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745"},
 ]
 virtualenv = [
-    {file = "virtualenv-16.7.7-py2.py3-none-any.whl", hash = "sha256:11cb4608930d5fd3afb545ecf8db83fa50e1f96fc4fca80c94b07d2c83146589"},
+    {file = "virtualenv-16.7.8-py2.py3-none-any.whl", hash = "sha256:b57776b44f91511866594e477dd10e76a6eb44439cdd7f06dcd30ba4c5bd854f"},
-    {file = "virtualenv-16.7.7.tar.gz", hash = "sha256:d257bb3773e48cac60e475a19b608996c73f4d333b3ba2e4e57d5ac6134e0136"},
+    {file = "virtualenv-16.7.8.tar.gz", hash = "sha256:116655188441670978117d0ebb6451eb6a7526f9ae0796cc0dee6bd7356909b0"},
 ]
 wcwidth = [
     {file = "wcwidth-0.1.7-py2.py3-none-any.whl", hash = "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"},

pyproject.toml

@@ -80,7 +80,7 @@ gaphorconvert = 'gaphor.tools.gaphorconvert:main'
 "namespace" = "gaphor.ui.namespace:Namespace"
 "toolbox" = "gaphor.ui.toolbox:Toolbox"
 "diagrams" = "gaphor.ui.mainwindow:Diagrams"
-"consolewindow" = "gaphor.plugins.console:ConsoleWindow"
+# "consolewindow" = "gaphor.plugins.console:ConsoleWindow"
 "elementeditor" = "gaphor.ui.elementeditor:ElementEditor"
 "diagram_export" = "gaphor.plugins.diagramexport:DiagramExport"
 "xmi_export" = "gaphor.plugins.xmiexport:XMIExport"