Skip to content

Commit

Permalink
removed duplication of license in pyproject and setup.py
Browse files Browse the repository at this point in the history
  • Loading branch information
dwr-psandhu committed Nov 20, 2024
1 parent 5219457 commit e168337
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 45 deletions.
22 changes: 0 additions & 22 deletions LICENSE

This file was deleted.

6 changes: 3 additions & 3 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set pyproject = load_file_data('pyproject.toml') %}
{% set pyproject = load_file_data("../pyproject.toml", from_recipe_dir=True) %}
{% set versioneer = pyproject['tool']['versioneer'] %}
{% set python_version = pyproject['project']['requires-python'] %}
{% set setup_data = load_setup_py_data() %}
Expand All @@ -18,7 +18,7 @@ build:
script: {{ PYTHON }} -m pip install --no-deps --ignore-installed -vv .
noarch: python
entry_points:
{% for entry in pyproject['project']['scripts'] %}
{% for entry in setup_data['entry_points']['console_scripts'] %}
- {{ entry }}
{% endfor %}
#skip: true
Expand Down Expand Up @@ -55,4 +55,4 @@ test:
about:
home: https://github.com/CADWRDeltaModeling/dms_datastore
summary: Downloading tools and data repository management
license: {{ pyproject['project']['license'] }}
license: {{ setup_data['license'] }}
20 changes: 0 additions & 20 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ build-backend = "setuptools.build_meta"
name = "dms_datastore"
description = "Downloading tools and data repository management"
dynamic = ["version"]
license = {file = "LICENSE"}
authors = [
{name = "Eli Ateljevich", email = "[email protected]"},
{name = "Nicky Sandhu", email = "[email protected]"}
Expand Down Expand Up @@ -56,22 +55,3 @@ parentdir_prefix = "dms_datastore-"
norecursedirs = [".*", "*.egg*", "build", "dist", "conda.recipe"]
addopts = "--junitxml=junit.xml --ignore setup.py --ignore run_test.py --tb native --strict-markers --durations=20"
markers = ["serial: execute test serially (to avoid race conditions)"]

[project.scripts]
download_hycom = "dms_datastore.download_hycom:main"
download_hrrr = "dms_datastore.download_hrrr:main"
download_noaa = "dms_datastore.download_noaa:main"
download_cdec = "dms_datastore.download_cdec:main"
download_wdl = "dms_datastore.download_wdl:main"
download_nwis = "dms_datastore.download_nwis:main"
download_des = "dms_datastore.download_des:main"
download_ncro = "dms_datastore.download_ncro:main"
compare_directories = "dms_datastore.compare_directories:main"
populate_repo = "dms_datastore.populate_repo:main"
station_info = "dms_datastore.station_info:main"
reformat = "dms_datastore.reformat:main"
auto_screen = "dms_datastore.auto_screen:main"
inventory = "dms_datastore.inventory:main"
usgs_multi = "dms_datastore.usgs_multi:main"
delete_from_filelist = "dms_datastore.delete_from_filelist:main"
data_cache = "dms_datastore.caching:main"
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
setup(
name="dms_datastore",
version=versioneer.get_version(),
license="MIT",
cmdclass=versioneer.get_cmdclass(),
description="Downloading tools and data repository management",
long_description=readme,
Expand Down

0 comments on commit e168337

Please sign in to comment.