Skip to content

Commit

Permalink
poetry removed, tags used directly for pyproject.toml variables
Browse files Browse the repository at this point in the history
  • Loading branch information
mpatrou committed Aug 31, 2023
1 parent b58fca7 commit d70d4eb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
11 changes: 6 additions & 5 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down
3 changes: 1 addition & 2 deletions environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: shiver-pkg
name: shiver
channels:
- conda-forge
- mantid/label/nightly
Expand All @@ -16,7 +16,6 @@ dependencies:
- pytest-cov=4.0.0
- setuptools
- sphinx
- poetry
- python-build
- pip
- pip:
Expand Down
6 changes: 1 addition & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down

0 comments on commit d70d4eb

Please sign in to comment.