Skip to content

Travis deploy and release 1.5.4 #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ __pycache__/
.eggs/

dist/*
/py/_version.py
.pytest_cache/
29 changes: 0 additions & 29 deletions .hgignore

This file was deleted.

68 changes: 0 additions & 68 deletions .hgtags

This file was deleted.

17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,23 @@ matrix:
- python: '2.7'
# using a different option due to pytest-addopts pytester issues
env: PYTEST_XADDOPTS="-n 3 --runslowtests" DEPS="pytest~=3.0.0 pytest-xdist"

- stage: deploy
python: '3.6'
env:
install: pip install -U setuptools setuptools_scm
script: skip
deploy:
provider: pypi
user: nicoddemus
distributions: sdist bdist_wheel
skip_upload_docs: true
password:
secure: VNYW/sZoD+9DzKCe6vANNXXJR7jP7rwySafQ33N1jAnCrdylQjEN/p6tSfUe8jDi3wDpLPL9h8pwfxuUT7CRxglHov3Qe7zSeywixvHan5aFahQiQ8+gucYIM7wITHH3oQs7jN35pnhdnF+QlW2+eDCL6qOLU5XwuRhsDKXjQ/hUWR5hlX5EniD1gzyKEf6j1YCpST87tKpeLwVEYEmsucdkUZuXhxDtyaWQHWiPsLWwh/slQtUJEHeLF26r8UxFy0RiGne9jR+CzRfH5ktcA9/pArvp4VuwOii+1TDxVSYP7+I8Z+eUKN9JBg12QLaHwoIN/8J+MvHCkuf+OGSLM3sEyNRJGDev372xg3K7ylIkeeK4WXirKEp2ojgN8tniloDjnwdu/gPWBnrXuooA60tNoByHFa8KbMZAr2B2sQeMxD4VZGr1N8l0rX4gRTrwvdk3i3ulLKVSwkXaGn+GrfZTTboa7dEnpuma8tv1niNCSpStYIy7atS8129+5ijV3OC8DzOMh/rVbO9WsDb/RPG3yjFiDvEJPIPeE0l/m5u42QBqtdZSS2ia7UWTJBiEY09uFMTRmH5hhE/1aiYBbvAztf5CReUbeKdSQz3L8TTSZqewtFZmXTkX97/xQnrEpsnGezIM2DNuMEuQG3MxGkNCxwbQKpx/bkHdrD75yMk=
on:
tags: true
repo: pytest-dev/py

allow_failures:
- python: 'pypy-5.4'
install:
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(unreleased)
============
1.5.4 (2018-06-27)
==================

- fix pytest-dev/pytest#3451: don't make assumptions about fs case sensitivity
in ``make_numbered_dir``.
Expand Down
17 changes: 17 additions & 0 deletions HOWTORELEASE.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
Release Procedure
-----------------

#. Create a branch ``release-X.Y.Z`` from the latest ``master``.

#. Manually update the ``CHANGELOG`` and commit.

#. Open a PR for this branch targeting ``master``.

#. After all tests pass and the PR has been approved by at least another maintainer, publish to PyPI by creating and pushing a tag::

git tag X.Y.Z
git push [email protected]:pytest-dev/py X.Y.Z

Wait for the deploy to complete, then make sure it is `available on PyPI <https://pypi.org/project/py>`_.

#. Merge your PR to ``master``.
7 changes: 6 additions & 1 deletion py/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@
import apipkg
lib_not_mangled_by_packagers = False
vendor_prefix = ''
__version__ = '1.5.3'

try:
from ._version import version as __version__
except ImportError:
# broken installation, we don't even try
__version__ = "unknown"


apipkg.initpkg(__name__, attr={'_apipkg': apipkg, 'error': error}, exportdefs={
Expand Down
16 changes: 2 additions & 14 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
import os
import sys

from setuptools import setup, find_packages


def get_version():
p = os.path.join(os.path.dirname(
os.path.abspath(__file__)), "py", "__init__.py")
with open(p) as f:
for line in f.readlines():
if "__version__" in line:
return line.strip().split("=")[-1].strip(" '")
raise ValueError("could not read version")


def main():
setup(
name='py',
description='library with cross-python path, ini-parsing, io, code, log facilities',
long_description=open('README.rst').read(),
version=get_version(),
use_scm_version={"write_to": "py/_version.py"},
setup_requires=["setuptools-scm"],
url='http://py.readthedocs.io/',
license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
Expand Down