From d70d4ebb3f44f4c755c69714bf70c0d870cbee55 Mon Sep 17 00:00:00 2001
From: Maria Patrou <patroum@ornl.gov>
Date: Thu, 31 Aug 2023 10:20:48 -0400
Subject: [PATCH] poetry removed, tags used directly for pyproject.toml
 variables

---
 conda.recipe/meta.yaml | 11 ++++++-----
 environment.yml        |  3 +--
 pyproject.toml         |  6 +-----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml
index 7e28b0f8..79812f05 100644
--- a/conda.recipe/meta.yaml
+++ b/conda.recipe/meta.yaml
@@ -1,9 +1,10 @@
-# load information from pyproject.toml through poetry
+# load information from pyproject.toml
 {% set pyproject = load_file_data('pyproject.toml') %}
-{% set poetry = pyproject.get('tool', {}).get('poetry') %}
-{% set license = poetry.get('license') %}
-{% set description = poetry.get('description') %}
-{% set url = poetry.get('repository') %}
+{% 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 git_describe_number = environ.get('GIT_DESCRIBE_NUMBER', '0') | string %}
diff --git a/environment.yml b/environment.yml
index 6e10e18f..19d489dc 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,4 +1,4 @@
-name: shiver-pkg
+name: shiver
 channels:
  - conda-forge
  - mantid/label/nightly
@@ -16,7 +16,6 @@ dependencies:
  - pytest-cov=4.0.0
  - setuptools
  - sphinx
- - poetry
  - python-build
  - pip
  - pip:
diff --git a/pyproject.toml b/pyproject.toml
index 0a9bfd46..d6a8f37a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -6,11 +6,7 @@ dependencies = [
     "mantidworkbench >= 6.6.20230517",
     "pyoncat ~= 1.6.1"
 ]
-
-[tool.poetry]
-description = "Spectroscopy Histogram Visualizer for Event Reduction"
-url = "https://github.com/neutrons/Shiver/"
-license = "GPL3.0"
+license = { text = "GPL3.0" }
 
 [project.urls]
 homepage = "https://github.com/neutrons/Shiver/"