From fd53ddc7719f4ab0331e6d2e1c22d5ed19141ffc Mon Sep 17 00:00:00 2001 From: sethg Date: Thu, 30 May 2024 17:21:07 +0200 Subject: [PATCH] Remove appveyor and use GHA to publish --- .github/workflows/main.yml | 7 +++++ appveyor.yml | 63 -------------------------------------- mappyfile.pyproj | 3 -- 3 files changed, 7 insertions(+), 66 deletions(-) delete mode 100644 appveyor.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 39f1b7d..9339956 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,6 +60,13 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} + - name: Publish package + if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') && matrix.python-version == '3.10' + uses: pypa/gh-action-pypi-publish@release/v1 + with: + # https://packaging.python.org/en/latest/guides/publishing-package-distribution-releases-using-github-actions-ci-cd-workflows/ + user: __token__ + password: ${{ secrets.MAPPYFILE_DEPLOY }} # see https://github.com/marketplace/actions/coveralls-github-action # we can't use coveralls-github-action as it doesn't support xml output diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 1bbc615..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,63 +0,0 @@ -# see https://www.appveyor.com/docs/windows-images-software/#python -# and https://packaging.python.org/guides/supporting-windows-using-appveyor/ - -image: Visual Studio 2019 - -environment: - - global: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: - secure: $(MAPPYFILE_DEPLOY) - - matrix: - - - PYTHON: "C:\\Python311-x64" - - PYTHON: "C:\\Python310-x64" - - PYTHON: "C:\\Python39-x64" - - PYTHON: "C:\\Python38" - -install: - # Note that you must use the environment variable %PYTHON% to refer to - # the interpreter you're using - Appveyor does not do anything special - # to put the Python version you want to use on PATH. - - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" - - "python -m pip install --upgrade pip" - - "pip install -r requirements-dev.txt" - - pip install . - -build_script: - - pip install -U setuptools - - pip install wheel - - pip install build - - python -m build --wheel - - python -m build --sdist - -test_script: - - python -m pytest # for unknown reason running pytest directly fails on Python 3.7 and above - - "flake8 ." - - mypy mappyfile tests docs/examples - - mappyfile schema mapfile-schema.json - - mappyfile schema mapfile-schema-8-0.json --version=8.0 - - mappyfile validate tests/sample_maps/256_overlay_res.map - - mappyfile format tests/sample_maps/256_overlay_res.map tests/sample_maps/256_overlay_res_formatted.map - -deploy: - - provider: GitHub - auth_token: - secure: 1FJ9ZyG2q5HxxYFSdC6HUA8+mjE9dKd55qPc6i2NZCRaOSDVog0tsoclT3e7N1sG - draft: true - on: - branch: master # release from master branch only - APPVEYOR_REPO_TAG: true # deploy on tag push only - -artifacts: - - path: 'dist\*.whl' - name: wheel - -deploy_script: - - ps: if ($env:APPVEYOR_REPO_TAG -eq $TRUE) { pip install -qq twine; twine upload --skip-existing dist/* } - -# Uncomment to enable debugging on the server -#on_finish: -# - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) diff --git a/mappyfile.pyproj b/mappyfile.pyproj index 5fffaac..52c5805 100644 --- a/mappyfile.pyproj +++ b/mappyfile.pyproj @@ -128,9 +128,6 @@ PROJ_LIB=C:\MapServer\bin\proj\SHARE - - Code - Code