Skip to content

Commit 70d02bf

Browse files
mayeuthenryiii
authored andcommitted
fix: check files in dist/* on all commits
Add `long_description_content_type` to metadata Fixes twine check warning
1 parent c7741a5 commit 70d02bf

File tree

4 files changed

+34
-11
lines changed

4 files changed

+34
-11
lines changed

.circleci/config.yml

+24-9
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,25 @@ jobs:
5858
manylinux-x64_cp27-cp27mu_tests-only:
5959
<<: *x64_build_job
6060

61+
check-dist:
62+
docker:
63+
- image: cimg/python:3.9.5
64+
steps:
65+
- attach_workspace:
66+
at: ./
67+
- run:
68+
name: Check dist
69+
command: |
70+
echo "Check dist"
71+
ls dist
72+
python -m venv ../venv
73+
. ../venv/bin/activate
74+
pip install twine
75+
twine check --strict dist/*
76+
6177
deploy-master:
6278
docker:
63-
- image: circleci/python:3.7.0-stretch
79+
- image: cimg/python:3.9.5
6480
steps:
6581
- attach_workspace:
6682
at: ./
@@ -71,7 +87,7 @@ jobs:
7187
7288
deploy-release:
7389
docker:
74-
- image: circleci/python:3.7.0-stretch
90+
- image: cimg/python:3.9.5
7591
steps:
7692
- attach_workspace:
7793
at: ./
@@ -100,25 +116,24 @@ workflows:
100116
- manylinux-x64_cp27-cp27mu_tests-only:
101117
<<: *no_filters
102118

103-
- deploy-master:
119+
- check-dist:
104120
requires:
105121
# x64
106122
- manylinux-x64_cp37-cp37m_upload-sdist
107123
# x86
108124
- manylinux-x86_cp37-cp37m
109125
# python 2.7 test
110126
- manylinux-x64_cp27-cp27mu_tests-only
127+
128+
- deploy-master:
129+
requires:
130+
- check-dist
111131
filters:
112132
branches:
113133
only: master
114134
- deploy-release:
115135
requires:
116-
# x64
117-
- manylinux-x64_cp37-cp37m_upload-sdist
118-
# x86
119-
- manylinux-x86_cp37-cp37m
120-
# python 2.7 test
121-
- manylinux-x64_cp27-cp27mu_tests-only
136+
- check-dist
122137
filters:
123138
tags:
124139
only: /^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$/

.travis.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,17 @@ script:
8585
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
8686
ci test
8787
fi
88+
pwd
89+
ls dist
90+
PATH=~/.pyenv/versions/${PYTHON_VERSION}/bin/:$PATH
91+
twine --version
92+
twine check --strict dist/*
8893
8994
after_success:
9095
- |
9196
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
9297
ci after_test
9398
fi
94-
pwd && ls dist; PATH=~/.pyenv/versions/${PYTHON_VERSION}/bin/:$PATH && twine --version
9599
96100
deploy:
97101
# deploy-release

appveyor.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ build_script:
3939

4040
test_script:
4141
- "%PYTHON_DIR%\\python.exe -m ci test"
42+
- ps: |
43+
$env:PATH="$env:PYTHON_DIR/Scripts/;$env:PATH"
44+
twine check --strict dist/*
4245
4346
after_test:
4447
- "%PYTHON_DIR%\\python.exe -m ci after_test"
@@ -48,9 +51,9 @@ on_finish:
4851

4952
deploy_script:
5053
- ps: |
54+
$env:PATH="$env:PYTHON_DIR/Scripts/;$env:PATH"
5155
if ($env:appveyor_repo_tag -eq $true -and $env:appveyor_repo_tag_name –match "^[0-9]+(\.[0-9]+)*(\.post[0-9]+)?$") {
5256
Write-Host "deploy release"
53-
$env:PATH="$env:PYTHON_DIR/Scripts/;$env:PATH"
5457
twine upload -u $env:PYPI_USER -p $env:PYPI_PASSWORD --skip-existing dist/*
5558
} elseif ($env:appveyor_repo_branch -eq "master") {
5659
Write-Host "deploy master (not implemented)"

setup.py

+1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ def parse_requirements(filename):
6868
'tools designed to build, test and package software',
6969

7070
long_description=readme + '\n\n' + history,
71+
long_description_content_type='text/x-rst',
7172

7273
classifiers=[
7374
'License :: OSI Approved :: Apache Software License',

0 commit comments

Comments
 (0)