Skip to content

Commit

Permalink
Merge pull request #260 from simplejson/pep-0527
Browse files Browse the repository at this point in the history
Per PEP 527 stop building bdist_wininst
  • Loading branch information
etrepum committed Mar 14, 2020
2 parents 6cbbd18 + 0c46bf7 commit 288e4e0
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 9 deletions.
19 changes: 12 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,24 @@ matrix:
services:
- docker
env: BUILD_SDIST=true
- name: Python 2.7.12 on macOS
- name: Python 2.7.17 on macOS
os: osx
language: objective-c
env: PYENV_VERSION=2.7.12
- name: Python 3.6.5 on macOS
env: PYENV_VERSION=2.7.17
- name: Python 3.6.9 on macOS
os: osx
language: objective-c
env: PYENV_VERSION=3.6.5
- name: Python 3.7.4 on macOS
env: PYENV_VERSION=3.6.9
- name: Python 3.7.5 on macOS
os: osx
osx_image: xcode11.2
osx_image: xcode11.3
language: objective-c
env: PYENV_VERSION=3.7.4
env: PYENV_VERSION=3.7.5
- name: Python 3.8.0 on macOS
os: osx
osx_image: xcode11.3
language: objective-c
env: PYENV_VERSION=3.8.0
install:
- "./.travis/install.sh"
script:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ build: off
test_script:
- "%WITH_COMPILER% %PYTHON%/python setup.py build_ext -i"
- "%WITH_COMPILER% %PYTHON%/python setup.py test"
- "%WITH_COMPILER% %PYTHON%/python setup.py bdist_wheel bdist_wininst"
- "%WITH_COMPILER% %PYTHON%/python setup.py bdist_wheel"

artifacts:
- path: dist\*.exe
Expand Down
2 changes: 1 addition & 1 deletion scripts/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def artifact_matcher(version):
def matches(fn):
return (
fn.startswith(prefix) and
os.path.splitext(fn)[1] in ('.exe', '.whl') and
fn.endswith('.whl') and
not fn.endswith('-none-any.whl')
) or fn == '{}.tar.gz'.format(prefix)
return matches
Expand Down

0 comments on commit 288e4e0

Please sign in to comment.