From 1aec3bc682c18a9c9b473386b68f6faaae432a04 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Wed, 4 Jul 2018 13:02:30 +0200 Subject: [PATCH 1/2] Bump to version 1.0.5 * Build 3.7 wheels * slim sdist * main tests on 3.7 Signed-off-by: Alexey Stepanov --- .travis.yml | 9 +++++---- MANIFEST.in | 8 ++++++++ TODO.md | 1 - threaded/__init__.py | 2 +- tools/build-wheels.sh | 2 +- tox.ini | 13 +++++++++---- 6 files changed, 24 insertions(+), 11 deletions(-) delete mode 100644 TODO.md diff --git a/.travis.yml b/.travis.yml index 72fe531..195ea96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ python: - 2.7 - 3.4 - 3.5 -- &mainstream_python 3.6 +- 3.6 +- &mainstream_python 3.7-dev - &pypy pypy - pypy3.5 -- 3.7-dev install: - &upgrade_python_toolset pip install --upgrade pip setuptools wheel - pip install tox-travis @@ -21,7 +21,7 @@ jobs: fast_finish: true include: - stage: Static analisys - python: *mainstream_python + python: 3.6 services: skip install: - *upgrade_python_toolset @@ -53,6 +53,7 @@ jobs: - ./tools/run_docker.sh "threaded" before_deploy: - pip install -r build_requirements.txt + - python setup.py bdist_wheel deploy: - provider: pypi # `skip_cleanup: true` is required to preserve binary wheels, built @@ -63,7 +64,7 @@ jobs: secure: "h1gXulNJxdjdUtPXDwUf/2MltjjiTy/cSsv+67Bxr9PAXSo9s0ynnhijKavE0QlKPr0NDJcEcl79dEN3gx1rkbAFZ+YRJfx0KHy26ImNAIx+npOFjGko87KhMNkrE3QBn9carWNnjYA4rCuUqbv/Znk9xixleE/sHJbKnkkTrerSI2jkznMa6h0FNVCEPzFesHmll7rBy4CjFkRcWNX8nfKNIV9rHFI7mXm8+jzl0msOnkEcKRqAk+MUwVjcD9XtpF42uA0nQTtqjWFdwSUxxBJKMyrkkI0o8Uk06EewkgJGwjGpvn+EUm1hBpjGrXUQQJyr20SZdC0CqaqXD/axISAtQPzP5I4Ey3VkLDV4mZuQjeNlbRbTH0Q7af+CpnOpFtYobIs1/HjB5wztazegT8uk4ZU/GheYqknXmtg9Ga8NV47sIpLC/hTLXWP+O/k0JKRYP9CgjTml2nLykNjZy4KRnlCUerYH8d4bNz687ElXU2bLtlBxyigUc9oo31DvNG+vB2axOp8wGiRTEpfBVPEF6EYUj+qSbX4ep4o/mWp+ax5YlLVYVoXkXpNecIggICAChIkqEl9MtGzTu31s3sBKpk9WuqoyHG80TDo2Tet6zWYx3itUx9M0SLkrML9Hs5WKsXDZE6jZrVHtx8lWuuZZl5JQkXYtd358lwJmEBM=" on: tags: true - distributions: sdist bdist_wheel + distributions: sdist skip_upload_docs: true cache: pip diff --git a/MANIFEST.in b/MANIFEST.in index 4d3f977..b546117 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,9 @@ include *.rst LICENSE requirements.txt +global-exclude *.c +exclude Makefile +prune tools +exclude .travis.yml appveyor.yml +exclude tox.ini pytest.ini .coveragerc +prune test +prune .github +exclude CODEOWNERS CODE_OF_CONDUCT.md diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 8b13789..0000000 --- a/TODO.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/threaded/__init__.py b/threaded/__init__.py index 8bd1f35..141030d 100644 --- a/threaded/__init__.py +++ b/threaded/__init__.py @@ -66,7 +66,7 @@ 'gthreadpooled' ) -__version__ = '1.0.4' +__version__ = '1.0.5' __author__ = "Alexey Stepanov" __author_email__ = 'penguinolog@gmail.com' __maintainers__ = { diff --git a/tools/build-wheels.sh b/tools/build-wheels.sh index 53a19a5..032245f 100755 --- a/tools/build-wheels.sh +++ b/tools/build-wheels.sh @@ -1,5 +1,5 @@ #!/bin/bash -PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m" +PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m" # Avoid creation of __pycache__/*.py[c|o] export PYTHONDONTWRITEBYTECODE=1 diff --git a/tox.ini b/tox.ini index ea592b9..300cdb4 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ [tox] minversion = 2.0 -envlist = pep8, pep257, py{27,34,35,36,37,py,py3}, pylint, docs, bandit, py{34,35,36}-nocov, +envlist = pep8, pep257, py{27,34,35,36,37,py,py3}, pylint, docs, bandit, py{34,35,36,37}-nocov, skipsdist = True skip_missing_interpreters = True @@ -48,6 +48,13 @@ commands = pip install threaded --no-index -f dist py.test -vv {posargs:test} +[testenv:py37-nocov] +usedevelop = False +commands = + python setup.py bdist_wheel + pip install threaded --no-index -f dist + py.test -vv {posargs:test} + [testenv:venv] commands = {posargs:} @@ -56,7 +63,7 @@ commands = {posargs:} 3.4 = py34, 3.5 = py35, 3.6 = py36, -3.7 = install, py37, +3.7 = py37, pypy = install, pypy, pypy3 = install, pypy3, @@ -78,14 +85,12 @@ usedevelop = False commands = pip install ./ -vvv -U [testenv:pylint] -basepython = python3.6 deps = pylint -r{toxinidir}/CI_REQUIREMENTS.txt commands = pylint threaded [flake8] -basepython = python3.6 exclude = .venv, .git, From 73f986ad1cef3bab8f0d4ad0d4c8a1fa9d888635 Mon Sep 17 00:00:00 2001 From: Alexey Stepanov Date: Wed, 4 Jul 2018 14:34:00 +0200 Subject: [PATCH 2/2] Fix CI_REQUIREMENTS Signed-off-by: Alexey Stepanov --- CI_REQUIREMENTS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI_REQUIREMENTS.txt b/CI_REQUIREMENTS.txt index 05b5900..5d1ee86 100644 --- a/CI_REQUIREMENTS.txt +++ b/CI_REQUIREMENTS.txt @@ -1,4 +1,4 @@ -typing >= 3.6 ; python_version < "3.7" +typing >= 3.6 ; python_version < "3.8" mock; python_version == "2.7" futures>=3.1; python_version == "2.7" gevent >= 1.2, <1.3.0 ; platform_python_implementation == "PyPy"