From 4a44f293bfdfe6460ede72bfcb48812290ed2e2c Mon Sep 17 00:00:00 2001 From: Jeremy Mack Wright Date: Tue, 8 May 2018 22:38:28 -0400 Subject: [PATCH] Version bump to 1.2.0 --- Libs/cadquery/README.md | 2 +- Libs/cadquery/cadquery/__init__.py | 2 +- Libs/cadquery/changes.md | 26 +++++++++++++++++++------- Libs/cadquery/doc/conf.py | 4 ++-- Libs/cadquery/requirements-dev.txt | 2 +- Libs/cadquery/setup.py | 2 +- README.md | 6 +++--- 7 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Libs/cadquery/README.md b/Libs/cadquery/README.md index af897e6..77e65ba 100644 --- a/Libs/cadquery/README.md +++ b/Libs/cadquery/README.md @@ -8,7 +8,7 @@ What is a CadQuery? [![Travis Build Status](https://travis-ci.org/dcowden/cadquery.svg?branch=master)](https://travis-ci.org/dcowden/cadquery?branch=master) [![Build status](https://ci.appveyor.com/api/projects/status/c7u4yjl8xxlokrw0/branch/master?svg=true)](https://ci.appveyor.com/project/jmwright/cadquery/branch/master) [![Coverage Status](https://coveralls.io/repos/github/dcowden/cadquery/badge.svg?branch=master)](https://coveralls.io/github/dcowden/cadquery?branch=master) -[![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=1.1.0&x2=0)](https://github.com/dcowden/cadquery/releases/tag/v1.1.0) +[![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=1.2.0&x2=0)](https://github.com/dcowden/cadquery/releases/tag/v1.2.0) [![License](https://img.shields.io/badge/license-Apache2-blue.svg)](https://github.com/dcowden/cadquery/blob/master/LICENSE) CadQuery is an intuitive, easy-to-use python based language for building parametric 3D CAD models. CadQuery is for 3D CAD what jQuery is for javascript. Imagine selecting Faces of a 3d object the same way you select DOM objects with JQuery! diff --git a/Libs/cadquery/cadquery/__init__.py b/Libs/cadquery/cadquery/__init__.py index efa7495..8f26a8c 100644 --- a/Libs/cadquery/cadquery/__init__.py +++ b/Libs/cadquery/cadquery/__init__.py @@ -18,4 +18,4 @@ __all__ = [ 'TypeSelector','DirectionMinMaxSelector','StringSyntaxSelector','Selector','plugins', ] -__version__ = "1.1.0" +__version__ = "1.2.0" diff --git a/Libs/cadquery/changes.md b/Libs/cadquery/changes.md index 475113c..db93722 100644 --- a/Libs/cadquery/changes.md +++ b/Libs/cadquery/changes.md @@ -2,6 +2,18 @@ Changes ======= +v1.2.0 +------ + * Multiple Anaconda CI fixes by @adam-urbanczyk + * @adam-urbanczyk added AppVeyor with Windows test integration to the CI pipeline + * @adam-urbanczyk added codecov in Travis CI configuration + * @jpmlt updated sweep operation to work with a list of wires #249 + * @gntech added ability to draw an arc from the current point to endPoint with an arc defined by the sag (sagitta) #253 + * @gntech added ability to draw an arc from the current point to endPoint with an arc defined by the radius #254 + * @gntech updated the close function to be smarter when the start point and end points are the same #257 + * @gntech removed some waste from the CI test environment by avoiding the installation of the FreeCAD docs #256 + + v1.1.0 ------ * Fixes and addition of graphical examples for selectors (thanks @adam-urbanczyk) #181 @@ -22,8 +34,8 @@ v1.1.0 * SVG export improvements including orientation control from @RustyVermeer #232 * Improved test coverage * @galou fixed braille example #229 - - + + v1.0.0 ------ * Added an option to do symmetric extrusion about the workplane (thanks @adam-urbanczyk) @@ -37,7 +49,7 @@ v1.0.0 v0.5.2 ------ * Added the sweep operation #33 - + v0.5.1 ------ * Mirroring fixes (thanks @huskier) @@ -72,7 +84,7 @@ v0.3.0 * Add the ability to find the center of the bounding box, rather than the center of mass (thanks @huskier) #122 * Changed normalize function to normalized to match OCC/PythonOCC nomenclature #124 * Added a label attribute to all freecad_impl.shapes so that they can have IDs attached to them #124 - + v0.2.0 ----- * Fixed versioning to match the semantic versioning scheme @@ -91,7 +103,7 @@ v0.2.0 * Increased test coverage * Added a clean function to keep some operations from failing on solids that need simplified (thanks @hyOzd) * Added a mention of the new Google Group to the readme - + v0.1.8 ----- * Added toFreecad() function as a convenience for val().wrapped @@ -112,11 +124,11 @@ v0.1.7 ----- * Added revolve operation and supporting tests * Fixed minor documentation errors - + v0.1.6 ----- * Added STEP import and supporting tests - + v0.1 ----- * Initial Version diff --git a/Libs/cadquery/doc/conf.py b/Libs/cadquery/doc/conf.py index 80974b1..c480c8c 100644 --- a/Libs/cadquery/doc/conf.py +++ b/Libs/cadquery/doc/conf.py @@ -55,9 +55,9 @@ copyright = 'Parametric Products Intellectual Holdings LLC, All Rights Reserved' # built documents. # # The short X.Y version. -version = '1.1' +version = '1.2' # The full version, including alpha/beta/rc tags. -release = '1.1.0' +release = '1.2.0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/Libs/cadquery/requirements-dev.txt b/Libs/cadquery/requirements-dev.txt index e5b3ec9..ab4e633 100644 --- a/Libs/cadquery/requirements-dev.txt +++ b/Libs/cadquery/requirements-dev.txt @@ -1,5 +1,5 @@ sphinx-rtd-theme==0.1.9 -travis-sphinx +travis-sphinx==2.1.0 Sphinx==1.3.2 coverage coveralls diff --git a/Libs/cadquery/setup.py b/Libs/cadquery/setup.py index 93f75c5..9de1feb 100644 --- a/Libs/cadquery/setup.py +++ b/Libs/cadquery/setup.py @@ -17,7 +17,7 @@ from setuptools import setup #if we are building in travis, use the build number as the sub-minor version -version = '1.1.0' +version = '1.2.0' if 'TRAVIS_TAG' in list(os.environ.keys()): version= os.environ['TRAVIS_TAG'] diff --git a/README.md b/README.md index 7368c80..928f4ac 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ The CadQuery Module for FreeCAD ======================= -[![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=1.1.0&x2=0)](https://github.com/jmwright/cadquery-freecad-module/releases/tag/v1.1.0) +[![GitHub version](https://d25lcipzij17d.cloudfront.net/badge.svg?id=gh&type=6&v=1.2.0&x2=0)](https://github.com/jmwright/cadquery-freecad-module/releases/tag/v1.2.0) [![License](https://img.shields.io/badge/license-LGPL-lightgrey.svg)](https://github.com/jmwright/cadquery-freecad-module/blob/master/LICENSE) ## Introduction @@ -14,7 +14,7 @@ Module that adds a tabbed CadQuery editor to FreeCAD. Please see the [wiki](http 1. Follow the instructions [here](https://github.com/FreeCAD/FreeCAD-addons/blob/master/README.md) to install and execute the FreeCAD-Addons macro. 2. Choose `cadquery_module` from the list in the datalog box and click Install/Update. 3. Restart FreeCAD. - + You can use the Install/Update button periodically to get the latest changes to this module. ## Manual Installation @@ -24,7 +24,7 @@ Installation is handled slightly differently whether you are installing version ### Installing v1.0.0.1 and Earlier -Download the [latest released version](https://github.com/jmwright/cadquery-freecad-module/releases), extract the archive file, and copy the `CadQuery` subdirectory to FreeCAD's `Mod` directory on your system. +Download the [latest released version](https://github.com/jmwright/cadquery-freecad-module/releases), extract the archive file, and copy the `CadQuery` subdirectory to FreeCAD's `Mod` directory on your system. ### Installing v1.0.0.2 and Later