Finalize conda & pip packaging

Makefile

@@ -1,4 +1,6 @@
 TST_NOTEBOOK:=algebraic_model.ipynb
+VERSION:=$(shell cat VERSION)
+
 #TST_IPNB:=algebraic_model_tst.ipynb
 
 .PHONY: doc test package tst-upload 
@@ -14,15 +16,25 @@ doc:
 clean:
 	rm -r dist
 
-package:
+package-pip:
 	python setup.py sdist bdist_wheel --universal
 
-tst-upload:
+package-conda :
+	conda build conda-recipe/meta.yaml
+
+package : package-pip package-conda
+
+tst-upload-pip:
 	twine upload --repository-url https://test.pypi.org/legacy/ dist/lca_algebraic*
 
-upload:
+upload-pip:
 	twine upload -u oie-minesparistech dist/lca_algebraic*
 
+upload-conda:
+	anaconda upload --force ~/anaconda3/conda-bld/noarch/lca_algebraic-$(VERSION)-py_0.tar.bz2
+
+upload : upload-pip upload-conda
+
 test:
 	# ipyrmd -y --from Rmd --to ipynb $(TST_NOTEBOOK) -o $(TST_IPNB)
 	./test/notebook_runner.py $(TST_NOTEBOOK)

VERSION

@@ -0,0 +1 @@
+0.0.3

meta.yaml → conda-recipe/meta.yaml

@@ -1,20 +1,19 @@
 {% set name = "lca_algebraic" %}
-{% set version = "0.0.2" %}
+{% set version = "0.0.3" %}
 
 package:
   name: "{{ name|lower }}"
   version: "{{ version }}"
 
 source:
-  path: ./
+  path: ../
 
 build:
   noarch: python
-  number: 0
   script: python -m pip install --no-deps --ignore-installed .
 
 requirements:
-  host:
+  build:
     - python 
     - pip
   run:
@@ -26,8 +25,8 @@ requirements:
     - nbconvert >=5.6.1
     - nbformat >=4.4.0
     - numpy >=1.16.6
+    - python
     - pandas
-    - python 
     - salib
     - scipy >=1.3.2
     - seaborn >=0.9.0

doc/lca.html

@@ -26,8 +26,8 @@ <h1 class="title">Module <code>lca_algebraic.lca</code></h1>
 </summary>
 <pre><code class="python">from collections import OrderedDict
 
+import re
 import numpy as np
-from slugify import slugify
 from sympy import lambdify
 
 from .base_utils import _actName, _eprint, _getDb
@@ -131,6 +131,8 @@ <h1 class="title">Module <code>lca_algebraic.lca</code></h1>
 def method_name(method):
     return method[1] + &#34; - &#34; + method[2]
 
+def _slugify(str) :
+    return re.sub(&#39;[^0-9a-zA-Z]+&#39;, &#39;_&#39;, str)
 
 def postMultiLCAAlgebric(methods, lambdas, alpha=1, **params):
     &#39;&#39;&#39;
@@ -283,7 +285,7 @@ <h1 class="title">Module <code>lca_algebraic.lca</code></h1>
 
         act = _getDb(db_name).get(code)
         name = act[&#39;name&#39;]
-        base_slug = slugify(name, separator=&#39;_&#39;)
+        base_slug = _slugify(name)
 
         slug = base_slug
         i = 1
@@ -375,7 +377,7 @@ <h2 id="returns">Returns</h2>
 
         act = _getDb(db_name).get(code)
         name = act[&#39;name&#39;]
-        base_slug = slugify(name, separator=&#39;_&#39;)
+        base_slug = _slugify(name)
 
         slug = base_slug
         i = 1

setup.py

@@ -10,7 +10,7 @@ def read(fname):
 
 setup(
     name = "lca_algebraic",
-    version = "0.0.2",
+    version = "0.0.3",
     author = "OIE - Mines ParisTech",
     author_email = "[email protected]",
     description = ("This library provides a layer above brightway2 for defining parametric models and running super fast LCA for monte carlo analysis."),