Skip to content

Commit

Permalink
Moving to dynamic versioning
Browse files Browse the repository at this point in the history
  • Loading branch information
castelao committed Mar 6, 2024
1 parent 22d17d2 commit f99e3cb
Show file tree
Hide file tree
Showing 16 changed files with 23 additions and 24 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ wheels/
*.egg-info/
.installed.cfg
*.egg
_version.py

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down
10 changes: 8 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
[build-system]
requires = ["setuptools >= 61.0"]
requires = [
"setuptools >= 61.0",
"setuptools_scm[toml] >= 8",
]
build-backend = "setuptools.build_meta"

[project]
name = "NREL-sup3r"
version = "0.1.2"
dynamic = ["version"]
description = "Super Resolving Renewable Resource Data (sup3r)"
keywords = ["sup3r", "NREL"]
readme = "README.rst"
Expand Down Expand Up @@ -61,3 +64,6 @@ repository = "https://github.com/NREL/sup3r"
[tool.setuptools]
include-package-data = true
packages = ["sup3r"]

[tool.setuptools_scm]
version_file = "sup3r/_version.py"
9 changes: 0 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
"""
setup.py
"""
import os
from codecs import open
from setuptools import setup
from setuptools.command.develop import develop
from subprocess import check_call
import shlex
from warnings import warn

here = os.path.abspath(os.path.dirname(__file__))

with open(os.path.join(here, "sup3r", "version.py"), encoding="utf-8") as f:
version = f.read()

version = version.split('=')[-1].strip().strip('"').strip("'")


class PostDevelopCommand(develop):
"""
Expand Down
3 changes: 2 additions & 1 deletion sup3r/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
"""Super Resolving Renewable Energy Resource Data (SUP3R)"""
import os
from sup3r.version import __version__

from ._version import __version__
# Next import sets up CLI commands
# This line could be "import sup3r.cli" but that breaks sphinx as of 12/11/2023
from sup3r.cli import main
Expand Down
2 changes: 1 addition & 1 deletion sup3r/bias/bias_calc_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import click

from sup3r import __version__
import sup3r.bias.bias_calc
from sup3r.utilities import ModuleName
from sup3r.utilities.cli import AVAILABLE_HARDWARE_OPTIONS, BaseCLI
from sup3r.version import __version__

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion sup3r/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from gaps import Pipeline

from sup3r.version import __version__
from sup3r import __version__
from sup3r.utilities import ModuleName
from sup3r.pipeline.forward_pass_cli import from_config as fwp_cli
from sup3r.solar.solar_cli import from_config as solar_cli
Expand Down
2 changes: 1 addition & 1 deletion sup3r/pipeline/forward_pass_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import os

from sup3r.utilities import ModuleName
from sup3r.version import __version__
from sup3r import __version__
from sup3r.pipeline.forward_pass import ForwardPassStrategy, ForwardPass
from sup3r.utilities.cli import AVAILABLE_HARDWARE_OPTIONS, BaseCLI

Expand Down
2 changes: 1 addition & 1 deletion sup3r/postprocessing/data_collect_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

import click

from sup3r import __version__
from sup3r.postprocessing.collection import CollectorH5, CollectorNC
from sup3r.utilities import ModuleName
from sup3r.utilities.cli import AVAILABLE_HARDWARE_OPTIONS, BaseCLI
from sup3r.utilities.utilities import get_source_type
from sup3r.version import __version__

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion sup3r/postprocessing/file_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
invert_uv,
pd_date_range,
)
from sup3r.version import __version__
from sup3r import __version__

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion sup3r/preprocessing/data_extract_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import click

import sup3r
from sup3r import __version__
from sup3r.utilities import ModuleName
from sup3r.utilities.cli import AVAILABLE_HARDWARE_OPTIONS, BaseCLI
from sup3r.version import __version__

logger = logging.getLogger(__name__)

Expand Down
2 changes: 1 addition & 1 deletion sup3r/qa/qa_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import click
import logging

from sup3r import __version__
from sup3r.utilities import ModuleName
from sup3r.version import __version__
from sup3r.qa.qa import Sup3rQa
from sup3r.utilities.cli import BaseCLI

Expand Down
2 changes: 1 addition & 1 deletion sup3r/qa/stats_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import click
import logging

from sup3r import __version__
from sup3r.utilities import ModuleName
from sup3r.version import __version__
from sup3r.qa.stats import Sup3rStatsMulti
from sup3r.utilities.cli import BaseCLI

Expand Down
2 changes: 1 addition & 1 deletion sup3r/qa/visual_qa_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import click
import logging

from sup3r import __version__
from sup3r.utilities import ModuleName
from sup3r.version import __version__
from sup3r.qa.visual_qa import Sup3rVisualQa
from sup3r.utilities.cli import BaseCLI

Expand Down
2 changes: 1 addition & 1 deletion sup3r/solar/solar_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import logging
import os

from sup3r import __version__
from sup3r.solar import Solar
from sup3r.utilities import ModuleName
from sup3r.version import __version__
from sup3r.utilities.cli import AVAILABLE_HARDWARE_OPTIONS, BaseCLI


Expand Down
2 changes: 1 addition & 1 deletion sup3r/utilities/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import phygnn
import rex

from sup3r.version import __version__
from sup3r import __version__


VERSION_RECORD = {'sup3r': __version__,
Expand Down
2 changes: 1 addition & 1 deletion sup3r/utilities/regridder_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from inspect import signature
import os

from sup3r import __version__
from sup3r.utilities import ModuleName
from sup3r.version import __version__
from sup3r.utilities.regridder import RegridOutput
from sup3r.utilities.cli import AVAILABLE_HARDWARE_OPTIONS, BaseCLI

Expand Down

0 comments on commit f99e3cb

Please sign in to comment.