Skip to content

Commit

Permalink
Preparing release 1.12.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mgedmin committed Aug 20, 2020
1 parent 7343195 commit 3ee1f60
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGES.rst
@@ -1,7 +1,7 @@
Changelog
=========

1.12.0 (unreleased)
1.12.0 (2020-08-20)
-------------------

- Added the ability to pass a text-mode file object to the ``stdout`` kwarg
Expand Down
4 changes: 2 additions & 2 deletions Makefile
@@ -1,4 +1,4 @@
PYTHON = python
PYTHON = python3

FILE_WITH_METADATA = profilehooks.py
FILE_WITH_VERSION = profilehooks.py
Expand All @@ -14,7 +14,7 @@ flake8:

.PHONY: test check
test check:
$(PYTHON) test_profilehooks.py
PYTHONTRACEMALLOC=10 $(PYTHON) test_profilehooks.py

.PHONY: coverage
coverage:
Expand Down
2 changes: 1 addition & 1 deletion profilehooks.py
Expand Up @@ -91,7 +91,7 @@ def fn(n):
__author__ = "Marius Gedminas <marius@gedmin.as>"
__copyright__ = "Copyright 2004-2020 Marius Gedminas and contributors"
__license__ = "MIT"
__version__ = '1.12.0.dev0'
__version__ = '1.12.0'
__date__ = "2020-08-20"

import atexit
Expand Down
8 changes: 4 additions & 4 deletions release.mk
@@ -1,4 +1,4 @@
# release.mk version 1.4 (2019-04-23)
# release.mk version 1.5 (2020-05-03)
#
# Helpful Makefile rules for releasing Python packages.
# https://github.com/mgedmin/python-project-skel
Expand All @@ -11,7 +11,7 @@ CHANGELOG_FORMAT ?= $(changelog_ver) ($(changelog_date))
DISTCHECK_DIFF_OPTS ?= $(DISTCHECK_DIFF_DEFAULT_OPTS)

# These should be fine
PYTHON ?= python
PYTHON ?= python3
PYPI_PUBLISH ?= rm -rf dist && $(PYTHON) setup.py -q sdist bdist_wheel && twine check dist/* && twine upload dist/*
LATEST_RELEASE_MK_URL = https://raw.githubusercontent.com/mgedmin/python-project-skel/master/release.mk
DISTCHECK_DIFF_DEFAULT_OPTS = -x PKG-INFO -x setup.cfg -x '*.egg-info' -I'^\#'
Expand Down Expand Up @@ -50,7 +50,7 @@ endif

.PHONY: distcheck-sdist
distcheck-sdist:
make dist
$(MAKE) dist
pkg_and_version=`$(PYTHON) setup.py --name`-`$(PYTHON) setup.py --version` && \
rm -rf tmp && \
mkdir tmp && \
Expand Down Expand Up @@ -102,7 +102,7 @@ check-changelog:

.PHONY: releasechecklist
releasechecklist: check-latest-rules check-latest-version check-version-number check-long-description check-changelog
make distcheck
$(MAKE) distcheck

.PHONY: release
release: releasechecklist do-release
Expand Down
3 changes: 3 additions & 0 deletions test_profilehooks.py
Expand Up @@ -299,6 +299,9 @@ def doctest_profile_with_stdout_redirect():
*** PROFILER RESULTS ***
sample_fn (<doctest test_profilehooks.doctest_profile_with_stdout_redirect[2]>:1)
...
>>> fp.close()
"""


Expand Down
2 changes: 1 addition & 1 deletion tox.ini
@@ -1,5 +1,5 @@
[tox]
envlist = py27,py35,py36,py37,py38,pypy
envlist = py27,py35,py36,py37,py38,pypy,pypy3

[testenv]
commands =
Expand Down

0 comments on commit 3ee1f60

Please sign in to comment.