Merge branch 'issue-29' into develop

brightway-lca · Mar 18, 2024 · 8609720 · 8609720
2 parents 0e293ad + 52268ff
commit 8609720
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 15 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014, Chris Mutel and ETH Zürich
+Copyright (c) 2024, Chris Mutel and ETH Zürich
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/conda.recipe-legacy/bld.bat b/conda.recipe-legacy/bld.bat
diff --git a/conda.recipe-legacy/build.sh b/conda.recipe-legacy/build.sh
diff --git a/conda.recipe-legacy/meta.yaml b/conda.recipe-legacy/meta.yaml
@@ -1,6 +1,14 @@
+# The regex used is a bit different from original documenation:
+# https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#loading-data-from-other-files
+# Originald documentation implies that the __init__.py only has one line with __version__
+{% set version_match = load_file_regex(load_file="bw2ui/__init__.py",
+regex_pattern='(?:.*)__version__ = "(.+)"') %}
+{% set version = version_match[1] %}
+
+
 package:
         name: bw2ui
-        version: {{ GIT_DESCRIBE_TAG }}
+        version: {{ version }}
 
 source:
         git_url: ../
@@ -9,7 +17,6 @@ requirements:
         build:
                 - python
                 - setuptools
-                - setuptools_scm
         run:
                 - python >=3.6
                 - brightway2
@@ -24,13 +31,14 @@ requirements:
                 - genson
 
 about:
-        home: https://bitbucket.org/tomas_navarrete/brightway2-ui
+        home: https://github.com/brightway-lca/brightway2-ui
         license: BSD
-        license_file: LICENSE.txt
+        license_file: LICENSE
 
 build:
         entry_points:
                 - bw2-browser = bw2ui.bin.bw2_browser:main
                 - bw2-web     = bw2ui.bin.bw2_web:main
 
         noarch: python
+        script: {{ PYTHON }} -m pip install --no-deps --no-build-isolation . -vv
diff --git a/conda.recipe/bld.bat b/conda.recipe/bld.bat
diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh
diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
@@ -1,6 +1,14 @@
+# The regex used is a bit different from original documenation:
+# https://docs.conda.io/projects/conda-build/en/latest/resources/define-metadata.html#loading-data-from-other-files
+# Originald documentation implies that the __init__.py only has one line with __version__
+{% set version_match = load_file_regex(load_file="bw2ui/__init__.py",
+regex_pattern='(?:.*)__version__ = "(.+)"') %}
+{% set version = version_match[1] %}
+
+
 package:
         name: bw25ui
-        version: {{ GIT_DESCRIBE_TAG }}
+        version: {{ version }}
 
 source:
         git_url: ../
@@ -9,7 +17,6 @@ requirements:
         build:
                 - python
                 - setuptools
-                - setuptools_scm
         run:
                 - python >=3.6
                 - brightway25
@@ -24,13 +31,14 @@ requirements:
                 - genson
 
 about:
-        home: https://bitbucket.org/tomas_navarrete/brightway2-ui
+        home: https://github.com/brightway-lca/brightway2-ui
         license: BSD
-        license_file: LICENSE.txt
+        license_file: LICENSE
 
 build:
         entry_points:
                 - bw2-browser = bw2ui.bin.bw2_browser:main
                 - bw2-web     = bw2ui.bin.bw2_web:main
 
         noarch: python
+        script: {{ PYTHON }} -m pip install --no-deps --no-build-isolation . -vv
diff --git a/setup.py b/setup.py
@@ -0,0 +1,5 @@
+"""boilerplate necessary to build conda packages."""
+
+from setuptools import setup
+
+setup()