From 9b5b912fe1556ee1cb32261ab807183fe41126ed Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Thu, 9 Feb 2017 11:05:37 -0800 Subject: [PATCH 1/6] include *.pyx, *.c in MANIFEST --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index c74cefe09..d9f8fee87 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1 @@ -include *.rst LICENSE +include *.rst *.c *.pyx LICENSE From f09170022da6fa2c8aaa97cafdf209c71470a568 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Thu, 9 Feb 2017 11:06:36 -0800 Subject: [PATCH 2/6] =?UTF-8?q?Bump=20version:=200.1.2=20=E2=86=92=200.1.3?= =?UTF-8?q?b0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- discretize/__init__.py | 2 +- docs/conf.py | 4 ++-- setup.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 9bb013c33..53e40ce31 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,4 +1,4 @@ [bumpversion] -current_version = 0.1.2 +current_version = 0.1.3b0 files = setup.py discretize/__init__.py docs/conf.py diff --git a/discretize/__init__.py b/discretize/__init__.py index 019dd4a9b..e8e9bae85 100644 --- a/discretize/__init__.py +++ b/discretize/__init__.py @@ -5,7 +5,7 @@ from discretize.TreeMesh import TreeMesh from discretize import Tests -__version__ = '0.1.2' +__version__ = '0.1.3b0' __author__ = 'Rowan Cockett' __license__ = 'MIT' __copyright__ = 'Copyright 2017 Rowan Cockett' diff --git a/docs/conf.py b/docs/conf.py index 7098caca8..a1c93d085 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -60,9 +60,9 @@ # built documents. # # The short X.Y version. -version = '0.1.2' +version = '0.1.3b0' # The full version, including alpha/beta/rc tags. -release = '0.1.2' +release = '0.1.3b0' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 5b1e56ba8..f43b588ec 100644 --- a/setup.py +++ b/setup.py @@ -48,14 +48,14 @@ def configuration(parent_package='', top_path=None): setup( name="discretize", - version="0.1.2", + version="0.1.3b0", install_requires=[ 'numpy>=1.7', 'scipy>=0.13', 'cython', 'ipython', 'matplotlib', - 'pymatsolver>=0.1.2', + 'pymatsolver>=0.1.3b0', 'properties[math]' ], author="Rowan Cockett", From 43540059b7b15314b5969f5d959399bbb385b14c Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Thu, 9 Feb 2017 11:09:20 -0800 Subject: [PATCH 3/6] fix manifest --- MANIFEST.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index d9f8fee87..62c4ecc25 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1 +1,2 @@ -include *.rst *.c *.pyx LICENSE +include *.rst LICENSE +global-include *.pyx From 96ce563e82342a575d098e2d7a74e8c0a13781d6 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Thu, 9 Feb 2017 11:21:42 -0800 Subject: [PATCH 4/6] undo the bumbversion that happened on pymatsolver --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f43b588ec..1c560a4a2 100644 --- a/setup.py +++ b/setup.py @@ -55,7 +55,7 @@ def configuration(parent_package='', top_path=None): 'cython', 'ipython', 'matplotlib', - 'pymatsolver>=0.1.3b0', + 'pymatsolver>=0.1.2', 'properties[math]' ], author="Rowan Cockett", From e81e6ef34065ad36b3f366b3d975133ce6d10317 Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Thu, 9 Feb 2017 11:36:06 -0800 Subject: [PATCH 5/6] =?UTF-8?q?Bump=20version:=200.1.3b0=20=E2=86=92=200.1?= =?UTF-8?q?.3b1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- discretize/__init__.py | 2 +- docs/conf.py | 4 ++-- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 53e40ce31..20d9bd60b 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,4 +1,4 @@ [bumpversion] -current_version = 0.1.3b0 +current_version = 0.1.3b1 files = setup.py discretize/__init__.py docs/conf.py diff --git a/discretize/__init__.py b/discretize/__init__.py index e8e9bae85..4cbbc8995 100644 --- a/discretize/__init__.py +++ b/discretize/__init__.py @@ -5,7 +5,7 @@ from discretize.TreeMesh import TreeMesh from discretize import Tests -__version__ = '0.1.3b0' +__version__ = '0.1.3b1' __author__ = 'Rowan Cockett' __license__ = 'MIT' __copyright__ = 'Copyright 2017 Rowan Cockett' diff --git a/docs/conf.py b/docs/conf.py index a1c93d085..c672b777e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -60,9 +60,9 @@ # built documents. # # The short X.Y version. -version = '0.1.3b0' +version = '0.1.3b1' # The full version, including alpha/beta/rc tags. -release = '0.1.3b0' +release = '0.1.3b1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 1c560a4a2..d8d75319f 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ def configuration(parent_package='', top_path=None): setup( name="discretize", - version="0.1.3b0", + version="0.1.3b1", install_requires=[ 'numpy>=1.7', 'scipy>=0.13', From 6ef3b98126e2d7df56b5613132442952c60249bb Mon Sep 17 00:00:00 2001 From: Lindsey Heagy Date: Thu, 9 Feb 2017 14:50:38 -0800 Subject: [PATCH 6/6] =?UTF-8?q?Bump=20version:=200.1.3b1=20=E2=86=92=200.1?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- discretize/__init__.py | 2 +- docs/conf.py | 4 ++-- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 20d9bd60b..bc306a591 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,4 +1,4 @@ [bumpversion] -current_version = 0.1.3b1 +current_version = 0.1.3 files = setup.py discretize/__init__.py docs/conf.py diff --git a/discretize/__init__.py b/discretize/__init__.py index 4cbbc8995..4d02bdbb5 100644 --- a/discretize/__init__.py +++ b/discretize/__init__.py @@ -5,7 +5,7 @@ from discretize.TreeMesh import TreeMesh from discretize import Tests -__version__ = '0.1.3b1' +__version__ = '0.1.3' __author__ = 'Rowan Cockett' __license__ = 'MIT' __copyright__ = 'Copyright 2017 Rowan Cockett' diff --git a/docs/conf.py b/docs/conf.py index c672b777e..ccc0cafc3 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -60,9 +60,9 @@ # built documents. # # The short X.Y version. -version = '0.1.3b1' +version = '0.1.3' # The full version, including alpha/beta/rc tags. -release = '0.1.3b1' +release = '0.1.3' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index d8d75319f..3de67cbd7 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ def configuration(parent_package='', top_path=None): setup( name="discretize", - version="0.1.3b1", + version="0.1.3", install_requires=[ 'numpy>=1.7', 'scipy>=0.13',