Skip to content

Commit

Permalink
Reenable cp27 where possible (#31)
Browse files Browse the repository at this point in the history
* bump version 0.5.1a2 -> 0.5.1
* only disable py27 build on windows
* only upload if secrets are available
* only upload for release events
* remove .travis.yml (tests for linux switched to GH actions)
  • Loading branch information
mbarkhau authored Dec 13, 2020
1 parent 6fcbb1b commit 7e124fc
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nox-test.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

name: Run nox Tests
name: Nox Tests

on:
push:
Expand Down Expand Up @@ -34,7 +34,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [ '2.7', '3.6', '3.7', '3.8', '3.9' ]
python-version: [ '2.7', '3.5', '3.6', '3.7', '3.8', '3.9' ]
name: Test Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v2
Expand Down
23 changes: 11 additions & 12 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
# This workflows will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: Build and Publish Python Package
name: Build Wheels

on:
release:
types: [created, edited]

# on:
# push:
# pull_request:
# types: [opened]
release:
types: [created, edited]
push:
pull_request:
types: [opened]

env:
CIBW_SKIP: "cp27-* pp*"
CIBW_SKIP: "cp27-win* pp*"

jobs:
build_wheels:
Expand Down Expand Up @@ -52,19 +50,20 @@ jobs:
- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
twine check ./wheelhouse/*.whl
- name: Build sdist
if: runner.os == 'Linux'
run: |
python setup.py sdist
twine check ./dist/*.tar.gz
- name: Publish sdist
if: runner.os == 'Linux'
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
if: ${{ github.event_name == 'release' && runner.os == 'Linux' && env.TWINE_USERNAME != null }}
run: |
twine check ./dist/*.tar.gz
twine upload --skip-existing ./dist/*
- uses: actions/upload-artifact@v2
Expand All @@ -77,6 +76,6 @@ jobs:
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
if: ${{ github.event_name == 'release' && env.TWINE_USERNAME != null }}
run: |
twine check ./wheelhouse/*.whl
twine upload --skip-existing ./wheelhouse/*
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ and can be installed with `pip` or `pipenv`::
pip install --user cmarkgfm
pipenv install cmarkgfm

Wheels are provided for macOS, Linux, and Windows for Python 3.5, 3.6, 3.7, 3.8 and 3.9.
Wheels are provided for macOS, Linux, and Windows for Python 2.7*, 3.5, 3.6, 3.7, 3.8 and 3.9.

Python 2.7 is supported in principle, if you can get it to compile. A PR to build wheels would be welcome.
* Python 2.7 is not supported on Windows. A PR to build wheels would be welcome.


Usage
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def finalize_options(self):

setup(
name='cmarkgfm',
version='0.5.1a2',
version='0.5.1',
description="Minimal bindings to GitHub's fork of cmark",
long_description=long_description,
long_description_content_type="text/x-rst",
Expand Down

0 comments on commit 7e124fc

Please sign in to comment.