v0.2.5 - changes to setup.py etc.

PascalLesage · Jun 21, 2019 · e230ea4 · e230ea4
1 parent 0d617f9
commit e230ea4
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 31 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,11 @@
+# 0.2.5 (2019-06-21)
+
+Like 0.2.4, but rereleased due to readme issues
+
+# 0.2.4 (2019-06-21)
+
+Change `DataPackageLoader.parameters` to `ConsolidatedIndexedParameterMapping`
+
 # 0.2.3 (2018-11-13)
 
 Update for API changes in `bw2parameters`.

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,6 @@
 recursive-include *.py
 include pytest.ini
 include LICENSE
+include *.png
 include *.md
 include *.txt
diff --git a/README.md b/README.md
@@ -1,5 +1,4 @@
-# presamples ![presamples](https://github.com/PascalLesage/presamples/blob/master/docs/build/_images/presamples_logo.png)
-
+# presamples ![](presamples_logo.png) 
 
  Package to write, load, manage and verify numerical arrays, called `presamples`.
 

diff --git a/README.rst b/README.rst
diff --git a/presamples/__init__.py b/presamples/__init__.py
@@ -13,7 +13,7 @@
 ]
 
 
-__version__ = (0, 2, 3)
+__version__ = (0, 2, 5)
 
 from .campaigns import Campaign, PresampleResource
 from .indexer import Indexer

diff --git a/presamples_logo.png b/presamples_logo.png
diff --git a/setup.py b/setup.py
@@ -14,6 +14,13 @@
             pkg = pkg.replace(os.path.altsep, '.')
         packages.append(pkg)
 
+f = open('README.md')
+readme = f.read()
+f.close()
+
+f = open('LICENSE')
+license_text = f.read()
+f.close()
 
 def package_files(directory):
     paths = []
@@ -25,11 +32,10 @@ def package_files(directory):
 
 setup(
     name='presamples',
-    version="0.2.3",
+    version="0.2.5",
     packages=packages,
     author="Pascal Lesage",
     author_email="pascal.lesage@polymtl.ca",
-    license=open('LICENSE').read(),
     install_requires=[
         'bw2calc',
         'bw2data',
@@ -39,9 +45,10 @@ def package_files(directory):
         'stats_arrays',
         'wrapt',
     ],
-    url="https://brightwaylca.org/",
-    long_description=open('README.rst').read(),
-    description='Creation and use of presampled values in Monte Carlo for Brightway LCA framework',
+    url="https://github.com/PascalLesage/presamples",
+    long_description=readme,
+    long_description_content_type="text/markdown",
+    description='Package to write, load, manage and verify numerical arrays, called presamples.',
     classifiers=[
         'Intended Audience :: End Users/Desktop',
         'Intended Audience :: Developers',