Skip to content

Commit

Permalink
[ci skip] Creating release 2020.1.14.
Browse files Browse the repository at this point in the history
I made sure the templates are populated correctly via:

```
$ python scripts/doc_template_release.py
CircleCI Build ID: 1609
AppVeyor Build ID: 1.0.1295.master
Coveralls Build ID: 28100309
Travis Build ID: 636950692
```

**NOTE**: This also means a change from semver to calver.
  • Loading branch information
dhermes committed Jan 15, 2020
1 parent 21d32e7 commit a20d1f6
Show file tree
Hide file tree
Showing 10 changed files with 86 additions and 87 deletions.
42 changes: 21 additions & 21 deletions DEVELOPMENT.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Binary Extension
Many low-level computations have alternate implementations in Fortran.
See the `Python Binary Extension`_ page for a more detailed description.

.. _Python Binary Extension: https://bezier.readthedocs.io/en/latest/python/binary-extension.html
.. _Python Binary Extension: https://bezier.readthedocs.io/en/2020.1.14/python/binary-extension.html

Building / Compiling
====================
Expand Down Expand Up @@ -101,7 +101,7 @@ QUADPACK subroutines depend on).
QUADPACK is used to perform numerical quadrature to compute the length
of a curve segment.

.. _directory: https://github.com/dhermes/bezier/tree/master/src/fortran/quadpack
.. _directory: https://github.com/dhermes/bezier/tree/2020.1.14/src/fortran/quadpack
.. _QUADPACK: https://en.wikipedia.org/wiki/QUADPACK

******************
Expand Down Expand Up @@ -260,32 +260,32 @@ To run the functional tests:
$ PYTHONPATH=src/python/ python3.8 -m pytest tests/functional/
$ PYTHONPATH=src/python/ pypy3 -m pytest tests/functional/
.. _functional tests: https://github.com/dhermes/bezier/tree/master/tests/functional
.. _functional tests: https://github.com/dhermes/bezier/tree/2020.1.14/tests/functional

For example, the following curve-curve intersection is a
functional test case:

.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/curves11_and_26.png
.. image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/curves11_and_26.png
:align: center

and there is a `Curve-Curve Intersection`_ document which captures many of
the cases in the functional tests.

.. _Curve-Curve Intersection: https://bezier.readthedocs.io/en/latest/algorithms/curve-curve-intersection.html
.. _Curve-Curve Intersection: https://bezier.readthedocs.io/en/2020.1.14/algorithms/curve-curve-intersection.html

A triangle-triangle intersection functional test case:

.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/triangles1Q_and_2Q.png
.. image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/triangles1Q_and_2Q.png
:align: center

a segment-box functional test case:

.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/test_goes_through_box08.png
.. image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/test_goes_through_box08.png
:align: center

and a "locate point on triangle" functional test case:

.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/test_triangle3_and_point1.png
.. image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/test_triangle3_and_point1.png
:align: center

Functional Test Data
Expand All @@ -303,10 +303,10 @@ This way, the test cases are programming language agnostic and can be
repurposed. The `JSON schema`_ for these files are stored in the
``tests/functional/schema`` directory.

.. _curves.json: https://github.com/dhermes/bezier/blob/master/tests/functional/curves.json
.. _curve_intersections.json: https://github.com/dhermes/bezier/blob/master/tests/functional/curve_intersections.json
.. _triangles.json: https://github.com/dhermes/bezier/blob/master/tests/functional/triangles.json
.. _triangle_intersections.json: https://github.com/dhermes/bezier/blob/master/tests/functional/triangle_intersections.json
.. _curves.json: https://github.com/dhermes/bezier/blob/2020.1.14/tests/functional/curves.json
.. _curve_intersections.json: https://github.com/dhermes/bezier/blob/2020.1.14/tests/functional/curve_intersections.json
.. _triangles.json: https://github.com/dhermes/bezier/blob/2020.1.14/tests/functional/triangles.json
.. _triangle_intersections.json: https://github.com/dhermes/bezier/blob/2020.1.14/tests/functional/triangle_intersections.json
.. _JSON schema: http://json-schema.org/

************
Expand All @@ -329,7 +329,7 @@ To check compliance:
A few extensions and overrides have been specified in the `pylintrc`_
configuration for ``bezier``.

.. _pylintrc: https://github.com/dhermes/bezier/blob/master/pylintrc
.. _pylintrc: https://github.com/dhermes/bezier/blob/2020.1.14/pylintrc

Docstring Style
===============
Expand Down Expand Up @@ -451,11 +451,11 @@ On AppVeyor, the binary extension is built and tested with both 32-bit and
.. _CircleCI: https://circleci.com/gh/dhermes/bezier
.. _Travis CI: https://travis-ci.org/dhermes/bezier
.. _AppVeyor: https://ci.appveyor.com/project/dhermes/bezier
.. _CircleCI config: https://github.com/dhermes/bezier/blob/master/.circleci/config.yml
.. _Travis config: https://github.com/dhermes/bezier/blob/master/.travis.yml
.. _AppVeyor config: https://github.com/dhermes/bezier/blob/master/.appveyor.yml
.. _python-multi Dockerfile: https://github.com/dhermes/python-multi/blob/master/src/Dockerfile
.. _bezier Dockerfile: https://github.com/dhermes/bezier/blob/master/scripts/docker/bezier.Dockerfile
.. _CircleCI config: https://github.com/dhermes/bezier/blob/2020.1.14/.circleci/config.yml
.. _Travis config: https://github.com/dhermes/bezier/blob/2020.1.14/.travis.yml
.. _AppVeyor config: https://github.com/dhermes/bezier/blob/2020.1.14/.appveyor.yml
.. _python-multi Dockerfile: https://github.com/dhermes/python-multi/blob/2020.1.14/src/Dockerfile
.. _bezier Dockerfile: https://github.com/dhermes/bezier/blob/2020.1.14/scripts/docker/bezier.Dockerfile
.. _multibuild: https://github.com/matthew-brett/multibuild
.. _discontinued: https://github.com/numpy/numpy/issues/11625

Expand Down Expand Up @@ -508,14 +508,14 @@ Supported Python Versions

Supported versions can be found in the ``noxfile.py`` `config`_.

.. _config: https://github.com/dhermes/bezier/blob/master/noxfile.py
.. _config: https://github.com/dhermes/bezier/blob/2020.1.14/noxfile.py

Versioning
==========

``bezier`` follows `semantic versioning`_.
``bezier`` follows `calendar versioning`_.

.. _semantic versioning: http://semver.org/
.. _calendar versioning: https://calver.org/

It is currently in major version zero (``0.y.z``), which means that
anything may change at any time and the public API should not be
Expand Down
4 changes: 2 additions & 2 deletions DEVELOPMENT.rst.template
Original file line number Diff line number Diff line change
Expand Up @@ -513,9 +513,9 @@ Supported versions can be found in the ``noxfile.py`` `config`_.
Versioning
==========

``bezier`` follows `semantic versioning`_.
``bezier`` follows `calendar versioning`_.

.. _semantic versioning: http://semver.org/
.. _calendar versioning: https://calver.org/

It is currently in major version zero (``0.y.z``), which means that
anything may change at any time and the public API should not be
Expand Down
48 changes: 20 additions & 28 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

|circle-build| |travis-build| |appveyor-build| |coverage|

|pypi| |versions|

|docs| |zenodo| |JOSS|

.. |eacute| unicode:: U+000E9 .. LATIN SMALL LETTER E WITH ACUTE
Expand All @@ -19,7 +17,7 @@ This library provides:

Dive in and take a look!

.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/triangles6Q_and_7Q.png
.. image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/triangles6Q_and_7Q.png
:align: center

Why B |eacute| zier?
Expand All @@ -28,17 +26,17 @@ Why B |eacute| zier?
A B |eacute| zier curve (and triangle, etc.) is a parametric curve
that uses the `Bernstein basis`_:

.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/bernstein_basis.png
.. image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/bernstein_basis.png
:align: center

to define a curve as a linear combination:

.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/bezier_defn.png
.. image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/bezier_defn.png
:align: center

This comes from the fact that the weights sum to one:

.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/sum_to_unity.png
.. image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/sum_to_unity.png
:align: center

This can be generalized to higher order by considering three, four, etc.
Expand Down Expand Up @@ -148,7 +146,7 @@ intersections):
>>> _ = ax.set_ylim(-0.0625, 0.625)
>>> plt.show()
.. image:: https://raw.githubusercontent.com/dhermes/bezier/master/docs/images/curves1_and_13.png
.. image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/curves1_and_13.png
:align: center

For API-level documentation, check out the B |eacute| zier Python
Expand Down Expand Up @@ -195,32 +193,26 @@ License
``bezier`` is made available under the Apache 2.0 License. For more
details, see `the LICENSE`_.

.. _Curves: https://bezier.readthedocs.io/en/latest/python/reference/bezier.curve.html
.. _Triangles: https://bezier.readthedocs.io/en/latest/python/reference/bezier.triangle.html
.. _package: https://bezier.readthedocs.io/en/latest/python/reference/bezier.html
.. _DEVELOPMENT doc: https://github.com/dhermes/bezier/blob/master/DEVELOPMENT.rst
.. _the LICENSE: https://github.com/dhermes/bezier/blob/master/LICENSE
.. _Curves: https://bezier.readthedocs.io/en/2020.1.14/python/reference/bezier.curve.html
.. _Triangles: https://bezier.readthedocs.io/en/2020.1.14/python/reference/bezier.triangle.html
.. _package: https://bezier.readthedocs.io/en/2020.1.14/python/reference/bezier.html
.. _DEVELOPMENT doc: https://github.com/dhermes/bezier/blob/2020.1.14/DEVELOPMENT.rst
.. _the LICENSE: https://github.com/dhermes/bezier/blob/2020.1.14/LICENSE

.. |docs| image:: https://readthedocs.org/projects/bezier/badge/?version=latest
:target: https://bezier.readthedocs.io/en/latest/
.. |docs| image:: https://readthedocs.org/projects/bezier/badge/?version=2020.1.14
:target: https://bezier.readthedocs.io/en/2020.1.14/
:alt: Documentation Status
.. |circle-build| image:: https://img.shields.io/circleci/project/github/dhermes/bezier/master.svg?maxAge=3600&logo=circleci&label=Linux
:target: https://circleci.com/gh/dhermes/bezier
.. |circle-build| image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/circleci-passing.svg?sanitize=true
:target: https://circleci.com/gh/dhermes/bezier/1609
:alt: CircleCI Build
.. |travis-build| image:: https://img.shields.io/travis/dhermes/bezier/master.svg?maxAge=3600&logo=travis&label=macOS
:target: https://travis-ci.org/dhermes/bezier
.. |travis-build| image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/travis-passing.svg?sanitize=true
:target: https://travis-ci.org/dhermes/bezier/builds/636950692
:alt: Travis Build
.. |appveyor-build| image:: https://img.shields.io/appveyor/ci/dhermes/bezier/master.svg?maxAge=3600&logo=appveyor&label=Windows
:target: https://ci.appveyor.com/project/dhermes/bezier
.. |appveyor-build| image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/appveyor-passing.svg?sanitize=true
:target: https://ci.appveyor.com/project/dhermes/bezier/build/1.0.1295.master
:alt: AppVeyor CI Build
.. |pypi| image:: https://img.shields.io/pypi/v/bezier.svg
:target: https://pypi.org/project/bezier/
:alt: PyPI Latest
.. |versions| image:: https://img.shields.io/pypi/pyversions/bezier.svg
:target: https://pypi.org/project/bezier/
:alt: Package Versions
.. |coverage| image:: https://coveralls.io/repos/github/dhermes/bezier/badge.svg
:target: https://coveralls.io/github/dhermes/bezier
.. |coverage| image:: https://s3.amazonaws.com/assets.coveralls.io/badges/coveralls_100.svg
:target: https://coveralls.io/builds/28100309
:alt: Code Coverage
.. |zenodo| image:: https://zenodo.org/badge/73047402.svg
:target: https://zenodo.org/badge/latestdoi/73047402
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
"keywords": "Geometry, Curve, B\u00e9zier, Intersection, Python",
"license": "Apache 2.0",
"title": "B\u00e9zier",
"version": "0.11.0"
"version": "2020.1.14"
}
26 changes: 9 additions & 17 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

|circle-build| |travis-build| |appveyor-build| |coverage|

|pypi| |versions|

|zenodo| |JOSS|

.. |eacute| unicode:: U+000E9 .. LATIN SMALL LETTER E WITH ACUTE
Expand Down Expand Up @@ -252,25 +250,19 @@ License
``bezier`` is made available under the Apache 2.0 License. For more
details, see `the LICENSE`_.

.. _the LICENSE: https://github.com/dhermes/bezier/blob/master/LICENSE
.. _the LICENSE: https://github.com/dhermes/bezier/blob/2020.1.14/LICENSE

.. |circle-build| image:: https://img.shields.io/circleci/project/github/dhermes/bezier/master.svg?maxAge=3600&logo=circleci&label=Linux
:target: https://circleci.com/gh/dhermes/bezier
.. |circle-build| image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/circleci-passing.svg?sanitize=true
:target: https://circleci.com/gh/dhermes/bezier/1609
:alt: CircleCI Build
.. |travis-build| image:: https://img.shields.io/travis/dhermes/bezier/master.svg?maxAge=3600&logo=travis&label=macOS
:target: https://travis-ci.org/dhermes/bezier
.. |travis-build| image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/travis-passing.svg?sanitize=true
:target: https://travis-ci.org/dhermes/bezier/builds/636950692
:alt: Travis Build
.. |appveyor-build| image:: https://img.shields.io/appveyor/ci/dhermes/bezier/master.svg?maxAge=3600&logo=appveyor&label=Windows
:target: https://ci.appveyor.com/project/dhermes/bezier
.. |appveyor-build| image:: https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/appveyor-passing.svg?sanitize=true
:target: https://ci.appveyor.com/project/dhermes/bezier/build/1.0.1295.master
:alt: AppVeyor CI Build
.. |pypi| image:: https://img.shields.io/pypi/v/bezier.svg
:target: https://pypi.org/project/bezier/
:alt: PyPI Latest
.. |versions| image:: https://img.shields.io/pypi/pyversions/bezier.svg
:target: https://pypi.org/project/bezier/
:alt: Package Versions
.. |coverage| image:: https://coveralls.io/repos/github/dhermes/bezier/badge.svg
:target: https://coveralls.io/github/dhermes/bezier
.. |coverage| image:: https://s3.amazonaws.com/assets.coveralls.io/badges/coveralls_100.svg
:target: https://coveralls.io/builds/28100309
:alt: Code Coverage
.. |zenodo| image:: https://zenodo.org/badge/73047402.svg
:target: https://zenodo.org/badge/latestdoi/73047402
Expand Down
6 changes: 3 additions & 3 deletions docs/python/binary-extension.rst
Original file line number Diff line number Diff line change
Expand Up @@ -579,9 +579,9 @@ For examples, see:
* `macOS journal`_
* `Windows journal`_

.. _Linux journal: https://github.com/dhermes/bezier/blob/master/.circleci/expected_journal.txt
.. _macOS journal: https://github.com/dhermes/bezier/blob/master/scripts/macos/travis_journal.txt
.. _Windows journal: https://github.com/dhermes/bezier/blob/master/appveyor/expected_journal.txt
.. _Linux journal: https://github.com/dhermes/bezier/blob/2020.1.14/.circleci/expected_journal.txt
.. _macOS journal: https://github.com/dhermes/bezier/blob/2020.1.14/scripts/macos/travis_journal.txt
.. _Windows journal: https://github.com/dhermes/bezier/blob/2020.1.14/appveyor/expected_journal.txt

***************************
Building a Python Extension
Expand Down
31 changes: 23 additions & 8 deletions docs/releases/latest.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Latest Release (``0.12.0.dev1``)
================================
Latest Release (``2020.1.14``)
==============================

|pypi| |docs|

Expand All @@ -10,9 +10,24 @@ Breaking Changes
(`#172 <https://github.com/dhermes/bezier/pull/172>`__).
Fixed `#132 <https://github.com/dhermes/bezier/issues/132>`__.

.. |pypi| image:: https://img.shields.io/pypi/v/bezier/0.12.0.svg
:target: https://pypi.org/project/bezier/0.12.0/
:alt: PyPI link to release 0.12.0
.. |docs| image:: https://readthedocs.org/projects/bezier/badge/?version=0.12.0
:target: https://bezier.readthedocs.io/en/0.12.0/
:alt: Documentation for release 0.12.0
Documentation
-------------

- Make sure all ABI ``example_*.c`` blocks get run with ``doctest``
(`#174 <https://github.com/dhermes/bezier/pull/174>`__).
Fixed `#173 <https://github.com/dhermes/bezier/issues/173>`__.

Packaging
---------

- Switched from `semantic versioning`_ to `calendar versioning`_.

.. _semantic versioning: http://semver.org/
.. _calendar versioning: https://calver.org/

.. |pypi| image:: https://img.shields.io/pypi/v/bezier/2020.1.14.svg
:target: https://pypi.org/project/bezier/2020.1.14/
:alt: PyPI link to release 2020.1.14
.. |docs| image:: https://readthedocs.org/projects/bezier/badge/?version=2020.1.14
:target: https://bezier.readthedocs.io/en/2020.1.14/
:alt: Documentation for release 2020.1.14
8 changes: 4 additions & 4 deletions paper.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ This library provides support for
- Specialization / reparameterization
- Self-intersection / singularity check for 2D triangles

-![Triangle-triangle intersection example](https://raw.githubusercontent.com/dhermes/bezier/0.11.0/docs/images/triangles6Q_and_7Q.png)
-![Triangle-triangle intersection example](https://raw.githubusercontent.com/dhermes/bezier/2020.1.14/docs/images/triangles6Q_and_7Q.png)

[1]: https://en.wikipedia.org/wiki/B%C3%A9zier_curve
[2]: https://en.wikipedia.org/wiki/B%C3%A9zier_triangle
[3]: https://bezier.readthedocs.io/en/0.11.0/algorithms/curve-curve-intersection.html
[4]: https://bezier.readthedocs.io/en/0.11.0/python/reference/bezier.curve.html#bezier.curve.Curve.locate
[5]: https://bezier.readthedocs.io/en/0.11.0/python/reference/bezier.triangle.html#bezier.triangle.Triangle.locate
[3]: https://bezier.readthedocs.io/en/2020.1.14/algorithms/curve-curve-intersection.html
[4]: https://bezier.readthedocs.io/en/2020.1.14/python/reference/bezier.curve.html#bezier.curve.Curve.locate
[5]: https://bezier.readthedocs.io/en/2020.1.14/python/reference/bezier.triangle.html#bezier.triangle.Triangle.locate

# References
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import setup_helpers_windows


VERSION = "0.12.0.dev1" # Also in ``codemeta.json`` and ``__init__.py``.
VERSION = "2020.1.14" # Also in ``codemeta.json`` and ``__init__.py``.
AUTHOR = "Danny Hermes" # Also in ``__init__.py``.
README_FILENAME = os.path.join(os.path.dirname(__file__), "README.rst")
NUMPY_MESSAGE = """\
Expand Down Expand Up @@ -101,7 +101,7 @@ def setup():
project_urls={
"Documentation": "https://bezier.readthedocs.io/",
"Changelog": (
"https://bezier.readthedocs.io/en/latest/releases/index.html"
"https://bezier.readthedocs.io/en/2020.1.14/releases/index.html"
),
"Issue Tracker": "https://github.com/dhermes/bezier/issues",
},
Expand Down
2 changes: 1 addition & 1 deletion src/python/bezier/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
# and related. This is **entirely** to accomodate builds where
# ``bezier`` is imported from source (and not installed).
__author__ = "Danny Hermes"
__version__ = "0.12.0.dev1"
__version__ = "2020.1.14"
"""str: The current version of :mod:`bezier`."""
__all__ = [
"__author__",
Expand Down

0 comments on commit a20d1f6

Please sign in to comment.