Merge pull request #100 from neutrons/conda_params

Parameters for Conda Package

conda.recipe/meta.yaml

@@ -1,24 +1,25 @@
-# load information from setup.cfg/setup.py
-{% set data = load_setup_py_data() %}
-{% set license = data.get('license') %}
-{% set description = data.get('description') %}
-{% set url = data.get('url') %}
+# load information from pyproject.toml
+{% set pyproject = load_file_data('pyproject.toml') %}
+{% set project = pyproject.get('project', {}) %}
+{% set license = project.get('license').get('text') %}
+{% set description = project.get('description') %}
+{% set project_url = pyproject.get('project', {}).get('urls') %}
+{% set url = project_url.get('homepage') %}
 # this will get the version set by environment variable
 {% set version = environ.get('VERSION') %}
-{% set version_number = environ.get('GIT_DESCRIBE_NUMBER', '0') | string %}
-
+{% set git_describe_number = environ.get('GIT_DESCRIBE_NUMBER', '0') | string %}
 
 package:
   name: shiver
-  version: {{ version_number }}
+  version: {{ version }}
 
 source:
   path: ..
 
 build:
   noarch: python
   linux-64: python
-  number: {{ version_number }}
+  number: {{ git_describe_number }}
   string: py{{py}}
   script: {{ PYTHON }} -m pip install . --no-deps --ignore-installed -vvv
 

pyproject.toml

@@ -2,14 +2,14 @@
 name = "shiver"
 description = "Spectroscopy Histogram Visualizer for Event Reduction"
 dynamic = ["version"]
-requires-python = ">=3.8"
 dependencies = [
     "mantidworkbench >= 6.6.20230517",
-    "pyoncat == 1.6.1"
+    "pyoncat ~= 1.6"
 ]
+license = { text = "GPL3.0" }
 
 [project.urls]
-"Homepage" = "https://github.com/neutrons/Shiver/"
+homepage = "https://github.com/neutrons/Shiver/"
 
 [build-system]
 requires = [
@@ -24,6 +24,14 @@ build-backend = "setuptools.build_meta"
 method = "git"
 default-tag = "0.0.1"
 
+[tool.versioningit.next-version]
+method = "minor"
+
+[tool.versioningit.format]
+distance = "{next_version}.dev{distance}"
+dirty = "{version}+d{build_date:%Y%m%d}"
+distance-dirty = "{next_version}.dev{distance}+d{build_date:%Y%m%d%H%M}"
+
 [tool.versioningit.write]
 file = "src/shiver/_version.py"