diff options
| author | Bob Ippolito <bob@redivi.com> | 2020-03-14 12:16:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-14 12:16:55 -0700 |
| commit | 288e4e005c39a2eb855b5225c5dc8ebcb82eee72 (patch) | |
| tree | 66456fac1d9f52a0ce45d825b666011c039dbdf4 | |
| parent | 6cbbd1859f7ff219c19f68d3063842cdd6db1885 (diff) | |
| parent | 0c46bf7a3f3c1f719bcfaa8a470e2363feb6632b (diff) | |
| download | simplejson-288e4e005c39a2eb855b5225c5dc8ebcb82eee72.tar.gz | |
Merge pull request #260 from simplejson/pep-0527
Per PEP 527 stop building bdist_wininst
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | scripts/release.py | 2 |
3 files changed, 14 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 7066101..5b6870f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: diff --git a/appveyor.yml b/appveyor.yml index 2ee5429..3eec161 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -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 diff --git a/scripts/release.py b/scripts/release.py index 8253ab1..34e23ff 100644 --- a/scripts/release.py +++ b/scripts/release.py @@ -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 |