-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #94 from Erotemic/dev/0.15.4
Start branch for 0.15.4
- Loading branch information
Showing
10 changed files
with
71 additions
and
202 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -75,7 +75,7 @@ __doc__: &__doc__ | |
Instructions: | ||
Browse to: | ||
https://app.circleci.com/settings/project/github/GITHUB_USER/PYPKG/environment-variables | ||
https://app.circleci.com/settings/project/github/Erotemic/xdoctest/environment-variables | ||
Do whatever you need to locally access the values of these variables | ||
|
@@ -211,6 +211,7 @@ workflows: | |
version: 2 | ||
test: | ||
jobs: | ||
- test_full/cp310-310-linux | ||
- test_full/cp39-39-linux | ||
- test_full/cp38-38-linux | ||
- test_full/cp37-37m-linux | ||
|
@@ -219,6 +220,7 @@ workflows: | |
- test_full/cp34-34m-linux | ||
- test_full/cp27-27mu-linux | ||
|
||
- test_minimal/cp310-310-linux | ||
- test_minimal/cp39-39-linux | ||
- test_minimal/cp38-38-linux | ||
- test_minimal/cp37-37m-linux | ||
|
@@ -260,6 +262,7 @@ jobs: | |
- image: circleci/python | ||
steps: | ||
- checkout | ||
#working_directory: ~/{{ .Environment.CIRCLE_JOB }} | ||
|
||
.test_minimal_template: &test_minimal_template | ||
<<: | ||
|
@@ -289,12 +292,15 @@ jobs: | |
name: run tests | ||
command: | | ||
. venv/bin/activate | ||
# pip install pytest-cov==2.8.1 # hack to avoid regression | ||
#python run_tests.py | ||
python -m pytest --cov=xdoctest --cov-config .coveragerc --cov-report term -s | ||
$PYTHON_EXE run_tests.py | ||
# Upload to codecov.io (requires a CODECOV_TOKEN environ or github+circleci integration) | ||
codecov | ||
- store_artifacts: | ||
path: test-reports | ||
destination: test-reports | ||
- store_artifacts: | ||
path: .coverage | ||
destination: .coverage | ||
|
||
|
||
.test_full_template: &test_full_template | ||
|
@@ -325,12 +331,15 @@ jobs: | |
name: run tests | ||
command: | | ||
. venv/bin/activate | ||
# pip install pytest-cov==2.8.1 # hack to avoid regression | ||
#python run_tests.py | ||
python -m pytest --cov=xdoctest --cov-config .coveragerc --cov-report term -s | ||
$PYTHON_EXE run_tests.py | ||
# Upload to codecov.io (requires a CODECOV_TOKEN environ or github+circleci integration) | ||
codecov | ||
- store_artifacts: | ||
path: test-reports | ||
destination: test-reports | ||
- store_artifacts: | ||
path: .coverage | ||
destination: .coverage | ||
|
||
.gpgsign_template: &gpgsign_template | ||
<<: | ||
|
@@ -395,20 +404,20 @@ jobs: | |
# Execute the publish script for real this time | ||
MB_PYTHON_TAG=$MB_PYTHON_TAG DO_GPG=True GPG_KEYID=$GPG_KEYID TWINE_PASSWORD=$TWINE_PASSWORD TWINE_USERNAME=$TWINE_USERNAME GPG_EXECUTABLE=$GPG_EXECUTABLE CURRENT_BRANCH=release DEPLOY_BRANCH=release DO_UPLOAD=True DO_TAG=False ./publish.sh | ||
# Have the server git-tag the release and push the tags | ||
VERSION=$(python -c "import setup; print(setup.VERSION)") | ||
VERSION=$($PYTHON_EXE -c "import setup; print(setup.VERSION)") | ||
# do sed twice to handle the case of https clone with and without a read token | ||
URL_HOST=$(git remote get-url origin | sed -e 's|https\?://.*@||g' | sed -e 's|https\?://||g') | ||
echo "URL_HOST = $URL_HOST" | ||
# A git config user name and email is required. Set if needed. | ||
if [[ "$(git config user.email)" == "" ]; then | ||
if [[ "$(git config user.email)" == "" ]]; then | ||
git config user.email "[email protected]" | ||
git config user.name "CircleCI" | ||
fi | ||
if [ $(git tag -l "$VERSION") ]; then | ||
echo "Tag already exists" | ||
else | ||
git tag $VERSION -m "tarball tag $VERSION" | ||
git push --tags "https://${GIT_PUSH_TOKEN}@${URL_HOST}" | ||
else | ||
echo "Tag already exists" | ||
fi | ||
|
@@ -421,6 +430,11 @@ jobs: | |
# | ||
# All we need to do is change the base docker image so python is the | ||
# version we want we can reuse everything else from the template | ||
# | ||
test_full/cp310-310-linux: | ||
<<: *test_full_template | ||
docker: | ||
- image: circleci/python:3.10-rc | ||
|
||
test_full/cp39-39-linux: | ||
<<: *test_full_template | ||
|
@@ -458,9 +472,13 @@ jobs: | |
- image: circleci/python:2.7 | ||
|
||
# ------------ | ||
test_minimal/cp310-310-linux: | ||
<<: *test_minimal_template | ||
docker: | ||
- image: circleci/python:3.10-rc | ||
|
||
test_minimal/cp39-39-linux: | ||
<<: *test_full_template | ||
<<: *test_minimal_template | ||
docker: | ||
- image: circleci/python:3.9 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,18 @@ | ||
#!/usr/bin/env python | ||
# -*- coding: utf-8 -*- | ||
if __name__ == '__main__': | ||
import pytest | ||
import sys | ||
# NOTE: it is important to return the correct error code | ||
sys.exit(pytest.main([ | ||
package_name = 'xdoctest' | ||
pytest_args = [ | ||
'-p', 'pytester', | ||
'-p', 'no:doctest', | ||
'--cov=xdoctest', | ||
'--cov-config', '.coveragerc', | ||
'--cov-report', 'html', | ||
'--cov-report', 'term', | ||
'--xdoctest', | ||
] + sys.argv[1:])) | ||
'--cov=' + package_name, | ||
package_name, 'testing' | ||
] | ||
pytest_args = pytest_args + sys.argv[1:] | ||
sys.exit(pytest.main(pytest_args)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.