Skip to content

Commit 5cc7191

Browse files
penguinologpenguinolog
committed
use_develop = false, use direct setup.py for tests
cleanup SDIST package Signed-off-by: Aleksei Stepanov <[email protected]> (cherry picked from commit c1aa5a6) Signed-off-by: Aleksei Stepanov <[email protected]>
1 parent 86277cc commit 5cc7191

File tree

6 files changed

+210
-305
lines changed

6 files changed

+210
-305
lines changed

‎.travis.yml‎

Lines changed: 133 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -2,155 +2,155 @@ sudo: false
22
language: python
33
os: linux
44
install:
5-
- &upgrade_python_toolset pip install --upgrade pip setuptools wheel
6-
- &install_test_deps pip install --upgrade pytest pytest-sugar
7-
- &install_deps pip install -r CI_REQUIREMENTS.txt
8-
- pip install --upgrade pytest-cov coveralls
5+
- &upgrade_python_toolset pip install --upgrade pip setuptools wheel
6+
- &install_test_deps pip install --upgrade pytest pytest-sugar
7+
- &install_deps pip install -r CI_REQUIREMENTS.txt
8+
- pip install --upgrade pytest-cov coveralls
99

1010
_python:
11-
- &python34
12-
name: "Python 3.4"
13-
python: "3.4"
14-
- &python35
15-
name: "Python 3.5"
16-
python: "3.5"
17-
- &python36
18-
name: "Python 3.6"
19-
python: "3.6"
20-
- &python37
21-
name: "Python 3.7"
22-
python: "3.7"
23-
dist: xenial
24-
sudo: true
25-
- &pypy3
26-
name: "PyPy3"
27-
python: "pypy3.5"
11+
- &python34
12+
name: "Python 3.4"
13+
python: "3.4"
14+
- &python35
15+
name: "Python 3.5"
16+
python: "3.5"
17+
- &python36
18+
name: "Python 3.6"
19+
python: "3.6"
20+
- &python37
21+
name: "Python 3.7"
22+
python: "3.7"
23+
dist: xenial
24+
sudo: true
25+
- &pypy3
26+
name: "PyPy3"
27+
python: "pypy3.5"
2828

2929
_helpers:
30-
- &install_cython pip install --upgrade Cython
31-
- &build_package python setup.py bdist_wheel
32-
- &install_built pip install threaded --no-index -f dist
33-
- &test_no_cov py.test -vv test
34-
- &test_cythonized
35-
stage: Test cythonized
36-
install:
37-
- *upgrade_python_toolset
38-
- *install_test_deps
39-
- *install_deps
40-
- *install_cython
41-
script:
42-
- *build_package
43-
- *install_built
44-
- *test_no_cov
45-
after_success: skip
30+
- &install_cython pip install --upgrade Cython
31+
- &build_package python setup.py bdist_wheel
32+
- &install_built pip install threaded --no-index -f dist
33+
- &test_no_cov py.test -vv test
34+
- &test_cythonized
35+
stage: Test cythonized
36+
install:
37+
- *upgrade_python_toolset
38+
- *install_test_deps
39+
- *install_deps
40+
- *install_cython
41+
script:
42+
- *build_package
43+
- *install_built
44+
- *test_no_cov
45+
after_success: skip
4646

47-
- &static_analysis
48-
stage: Static analysis
49-
<<: *python37
50-
after_success: skip
47+
- &static_analysis
48+
stage: Static analysis
49+
<<: *python37
50+
after_success: skip
5151

52-
- &code_style_check
53-
stage: Code style check
54-
<<: *python37
55-
after_success: skip
52+
- &code_style_check
53+
stage: Code style check
54+
<<: *python37
55+
after_success: skip
5656

5757
script:
58-
- pip install -e .
59-
- py.test -vv --cov-config .coveragerc --cov-report= --cov=threaded test
60-
- coverage report -m --fail-under 87
58+
- python setup.py develop -v
59+
- py.test -vv --cov-config .coveragerc --cov-report= --cov=threaded test
60+
- coverage report -m --fail-under 87
6161
after_success:
62-
- coveralls
62+
- coveralls
6363

6464
jobs:
6565
include:
66-
- <<: *static_analysis
67-
name: "PyLint"
68-
install:
69-
- *upgrade_python_toolset
70-
- *install_deps
71-
- pip install --upgrade "pylint >= 2.3" isort[pyproject,requirements]
72-
script:
73-
- pylint threaded
74-
- <<: *static_analysis
75-
name: "Bandit"
76-
install:
77-
- *upgrade_python_toolset
78-
- pip install --upgrade bandit
79-
script:
80-
- bandit -r threaded
81-
- <<: *static_analysis
82-
name: "MyPy"
83-
install:
84-
- *upgrade_python_toolset
85-
- *install_deps
86-
- pip install --upgrade "mypy >= 0.670"
87-
script:
88-
- mypy --strict threaded
89-
- <<: *static_analysis
90-
name: "PEP8"
91-
install:
92-
- *upgrade_python_toolset
93-
- pip install --upgrade flake8 flake8-bugbear
94-
script:
95-
- flake8
66+
- <<: *static_analysis
67+
name: "PyLint"
68+
install:
69+
- *upgrade_python_toolset
70+
- *install_deps
71+
- pip install --upgrade "pylint >= 2.3" isort[pyproject,requirements]
72+
script:
73+
- pylint threaded
74+
- <<: *static_analysis
75+
name: "Bandit"
76+
install:
77+
- *upgrade_python_toolset
78+
- pip install --upgrade bandit
79+
script:
80+
- bandit -r threaded
81+
- <<: *static_analysis
82+
name: "MyPy"
83+
install:
84+
- *upgrade_python_toolset
85+
- *install_deps
86+
- pip install --upgrade "mypy >= 0.670"
87+
script:
88+
- mypy --strict threaded
89+
- <<: *static_analysis
90+
name: "PEP8"
91+
install:
92+
- *upgrade_python_toolset
93+
- pip install --upgrade flake8 flake8-bugbear
94+
script:
95+
- flake8
9696

97-
# - <<: *code_style_check
98-
# name: "PEP257"
99-
# install:
100-
# - *upgrade_python_toolset
101-
# - pip install --upgrade pydocstyle
102-
# script:
103-
# - pydocstyle threaded
97+
# - <<: *code_style_check
98+
# name: "PEP257"
99+
# install:
100+
# - *upgrade_python_toolset
101+
# - pip install --upgrade pydocstyle
102+
# script:
103+
# - pydocstyle threaded
104104

105-
- stage: test
106-
<<: *python34
107-
- stage: test
108-
<<: *python35
109-
- stage: test
110-
<<: *python36
111-
- stage: test
112-
<<: *python37
113-
- stage: test
114-
<<: *pypy3
105+
- stage: test
106+
<<: *python34
107+
- stage: test
108+
<<: *python35
109+
- stage: test
110+
<<: *python36
111+
- stage: test
112+
<<: *python37
113+
- stage: test
114+
<<: *pypy3
115115

116-
- <<: *test_cythonized
117-
<<: *python34
118-
- <<: *test_cythonized
119-
<<: *python35
120-
- <<: *test_cythonized
121-
<<: *python36
122-
- <<: *test_cythonized
123-
<<: *python37
116+
- <<: *test_cythonized
117+
<<: *python34
118+
- <<: *test_cythonized
119+
<<: *python35
120+
- <<: *test_cythonized
121+
<<: *python36
122+
- <<: *test_cythonized
123+
<<: *python37
124124

125-
- stage: deploy
126-
# This prevents job from appearing in test plan unless commit is tagged:
127-
if: tag IS present
128-
# Run on pypy to build not cythonized wheel
129-
<<: *pypy3
130-
name: Build universal and cythonized bdist_wheel. Deploy bdist and sdist.
131-
services:
132-
- docker
133-
install:
134-
- *upgrade_python_toolset
135-
script:
136-
- ./tools/run_docker.sh "threaded"
137-
before_deploy:
138-
- pip install -r build_requirements.txt
139-
- *build_package
140-
deploy:
141-
- provider: pypi
142-
# `skip_cleanup: true` is required to preserve binary wheels, built
143-
# inside of manylinux1 docker container during `script` step above.
144-
skip_cleanup: true
145-
user: penguinolog
146-
password:
147-
secure: "h1gXulNJxdjdUtPXDwUf/2MltjjiTy/cSsv+67Bxr9PAXSo9s0ynnhijKavE0QlKPr0NDJcEcl79dEN3gx1rkbAFZ+YRJfx0KHy26ImNAIx+npOFjGko87KhMNkrE3QBn9carWNnjYA4rCuUqbv/Znk9xixleE/sHJbKnkkTrerSI2jkznMa6h0FNVCEPzFesHmll7rBy4CjFkRcWNX8nfKNIV9rHFI7mXm8+jzl0msOnkEcKRqAk+MUwVjcD9XtpF42uA0nQTtqjWFdwSUxxBJKMyrkkI0o8Uk06EewkgJGwjGpvn+EUm1hBpjGrXUQQJyr20SZdC0CqaqXD/axISAtQPzP5I4Ey3VkLDV4mZuQjeNlbRbTH0Q7af+CpnOpFtYobIs1/HjB5wztazegT8uk4ZU/GheYqknXmtg9Ga8NV47sIpLC/hTLXWP+O/k0JKRYP9CgjTml2nLykNjZy4KRnlCUerYH8d4bNz687ElXU2bLtlBxyigUc9oo31DvNG+vB2axOp8wGiRTEpfBVPEF6EYUj+qSbX4ep4o/mWp+ax5YlLVYVoXkXpNecIggICAChIkqEl9MtGzTu31s3sBKpk9WuqoyHG80TDo2Tet6zWYx3itUx9M0SLkrML9Hs5WKsXDZE6jZrVHtx8lWuuZZl5JQkXYtd358lwJmEBM="
148-
on:
149-
tags: true
150-
distributions: sdist
151-
skip_upload_docs: true
152-
skip_existing: true
125+
- stage: deploy
126+
# This prevents job from appearing in test plan unless commit is tagged:
127+
if: tag IS present
128+
# Run on pypy to build not cythonized wheel
129+
<<: *pypy3
130+
name: Build universal and cythonized bdist_wheel. Deploy bdist and sdist.
131+
services:
132+
- docker
133+
install:
134+
- *upgrade_python_toolset
135+
script:
136+
- ./tools/run_docker.sh "threaded"
137+
before_deploy:
138+
- pip install -r build_requirements.txt
139+
- *build_package
140+
deploy:
141+
- provider: pypi
142+
# `skip_cleanup: true` is required to preserve binary wheels, built
143+
# inside of manylinux1 docker container during `script` step above.
144+
skip_cleanup: true
145+
user: penguinolog
146+
password:
147+
secure: "h1gXulNJxdjdUtPXDwUf/2MltjjiTy/cSsv+67Bxr9PAXSo9s0ynnhijKavE0QlKPr0NDJcEcl79dEN3gx1rkbAFZ+YRJfx0KHy26ImNAIx+npOFjGko87KhMNkrE3QBn9carWNnjYA4rCuUqbv/Znk9xixleE/sHJbKnkkTrerSI2jkznMa6h0FNVCEPzFesHmll7rBy4CjFkRcWNX8nfKNIV9rHFI7mXm8+jzl0msOnkEcKRqAk+MUwVjcD9XtpF42uA0nQTtqjWFdwSUxxBJKMyrkkI0o8Uk06EewkgJGwjGpvn+EUm1hBpjGrXUQQJyr20SZdC0CqaqXD/axISAtQPzP5I4Ey3VkLDV4mZuQjeNlbRbTH0Q7af+CpnOpFtYobIs1/HjB5wztazegT8uk4ZU/GheYqknXmtg9Ga8NV47sIpLC/hTLXWP+O/k0JKRYP9CgjTml2nLykNjZy4KRnlCUerYH8d4bNz687ElXU2bLtlBxyigUc9oo31DvNG+vB2axOp8wGiRTEpfBVPEF6EYUj+qSbX4ep4o/mWp+ax5YlLVYVoXkXpNecIggICAChIkqEl9MtGzTu31s3sBKpk9WuqoyHG80TDo2Tet6zWYx3itUx9M0SLkrML9Hs5WKsXDZE6jZrVHtx8lWuuZZl5JQkXYtd358lwJmEBM="
148+
on:
149+
tags: true
150+
distributions: sdist
151+
skip_upload_docs: true
152+
skip_existing: true
153153

154154
cache: pip
155155
before_cache:
156-
- rm -f $HOME/.cache/pip/log/debug.log
156+
- rm -f $HOME/.cache/pip/log/debug.log

‎CHANGELOG.rst‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

‎MANIFEST.in‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
include *.rst LICENSE requirements.txt
2-
global-include *.pyx *.pxd
1+
include *.rst LICENSE requirements.txt pyproject.toml
32
global-exclude *.c
43
exclude Makefile
54
prune tools
6-
exclude .travis.yml appveyor.yml
7-
exclude tox.ini pytest.ini .coveragerc
5+
exclude .travis.yml appveyor.yml azure-pipelines.yml .pyup.yml
6+
exclude tox.ini pytest.ini .coveragerc .pylintrc
7+
exclude .gitignore .dockerignore
88
prune test
99
prune .github
10-
exclude CODEOWNERS CODE_OF_CONDUCT.md
10+
prune .azure_pipelines
11+
prune docs
12+
exclude CODEOWNERS CODE_OF_CONDUCT.md _config.yml

‎pyproject.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
requires = [
55
"setuptools >= 21.0.0,!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0", # PSF/ZPL
66
"wheel",
7+
"setuptools_scm",
78
]
89
build-backend="setuptools.build_meta"
910

1011
[tool.black]
1112
line-length = 120
1213
safe = true
14+
target-version = ["py34", "py35", "py36", "py37", "py38"]
1315

1416
[tool.isort]
1517
line_length = 120

0 commit comments

Comments
 (0)