Added requirements.txt, bugfix for installation when dependencies not present - upgrade to v1.0

lindonroberts · lindonroberts · commit 88668c2054e9 · 2018-07-17T11:45:13.000+01:00
diff --git a/dfogn/version.py b/dfogn/version.py
@@ -24,4 +24,4 @@
 
 """
 
-__version__ = '0.2'
+__version__ = '1.0'
diff --git a/docs/history.rst b/docs/history.rst
@@ -10,3 +10,7 @@ Version 0.2 (20 Feb 2018)
 -------------------------
 * Minor bug fix to trust region subproblem solver (the output :code:`crvmin` is calculated correctly) - this has minimal impact on the performance of DFO-GN.
 
+Version 1.0 (17 Jul 2018)
+-------------------------
+* Bug fix for installation when dependencies not installed, added requirements.txt - no changes to the DFO-GN algorithm.
+
diff --git a/manual.pdf b/manual.pdf
diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1,2 @@
+numpy>=1.11
+scipy>=0.18
diff --git a/setup.py b/setup.py
@@ -24,8 +24,12 @@
 
 from setuptools import setup
 
-# Get package version
-from dfogn import __version__
+# Get package version without "import dfogn" (which requires dependencies to already be installed)
+import os
+version = {}
+with open(os.path.join('dfogn', 'version.py')) as fp:
+    exec(fp.read(), version)
+__version__ = version['__version__']
 
 setup(
     name='DFOGN',
@@ -35,7 +39,7 @@
     author='Lindon Roberts',
     author_email='lindon.roberts@maths.ox.ac.uk',
     url="https://github.com/numericalalgorithmsgroup/dfogn/",
-    download_url="https://github.com/numericalalgorithmsgroup/dfogn/archive/0.2.tar.gz",
+    download_url="https://github.com/numericalalgorithmsgroup/dfogn/archive/1.0.tar.gz",
     packages=['dfogn'],
     license='GNU GPL',
     keywords = "mathematics derivative free optimization nonlinear least squares",

Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,4 @@`
`24`	`24`
`25`	`25`	`"""`
`26`	`26`
`27`		`-__version__ = '0.2'`
	`27`	`+__version__ = '1.0'`