From 27ce75bc2cbc2d7af126f5d2718560eaf68fecb7 Mon Sep 17 00:00:00 2001 From: carleyjmartin Date: Fri, 3 Feb 2023 13:28:25 -0600 Subject: [PATCH 1/6] test to see if hdw is installed --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 511cc067..3cd2f085 100644 --- a/setup.py +++ b/setup.py @@ -83,7 +83,7 @@ def run(self): 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7'], python_requires='>=3.6', - packages=find_packages(exclude=['docs', 'test']), + packages=find_packages(['pydarn/utils/hdw'],exclude=['docs', 'test']), author="SuperDARN Data Visualization Working Group", # used to import the logging config file into pydarn. include_package_data=True, From 103ceb1282ec04cb32ce9989dff80fe407548993 Mon Sep 17 00:00:00 2001 From: carleyjmartin Date: Fri, 3 Feb 2023 14:11:24 -0600 Subject: [PATCH 2/6] test again --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 3cd2f085..0fdc0d35 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ import warnings from os import path -from setuptools import setup, find_packages +from setuptools import setup, find_namespace_packages from setuptools.command.install import install, orig from setuptools.command.develop import develop from glob import glob @@ -83,7 +83,7 @@ def run(self): 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7'], python_requires='>=3.6', - packages=find_packages(['pydarn/utils/hdw'],exclude=['docs', 'test']), + packages=find_namespace_packages(exclude=['docs', 'test']), author="SuperDARN Data Visualization Working Group", # used to import the logging config file into pydarn. include_package_data=True, From 35d34c1b8b289d9a168ea46a99929b97114278ba Mon Sep 17 00:00:00 2001 From: Remington Rohel Date: Fri, 10 Feb 2023 20:00:39 +0000 Subject: [PATCH 3/6] Move to pyproject.toml and setup.cfg files for installation. * No longer prints out a warning on install about cartopy installation --- pyproject.toml | 3 ++ setup.cfg | 30 ++++++++++++++++ setup.py | 93 -------------------------------------------------- 3 files changed, 33 insertions(+), 93 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..8fc968b6 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools>=61.0.0"] +build-backend = "setuptools.build_meta" diff --git a/setup.cfg b/setup.cfg index 8183238a..b26c5c61 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,32 @@ [metadata] license_files = LICENSE +name = pydarn +version = attr: pydarn.version.__version__ +author = SuperDARN Data Visualization Working Group +long_description = file: README.md +long_description_content_type = text/markdown +description = Data visualization library for SuperDARN data +url = https://pydarn.readthedocs.io/en/latest/ +classifiers = + Development Status :: 5 - Production/Stable + License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3) + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + +[options] +python_requires = >=3.6 +packages = find_namespace: +include_package_data = True +install_requires = + pyyaml + numpy + matplotlib>=3.3.4 + aacgmv2 + pydarnio>=1.1.0 + +[options.packages.find] +exclude = + test* + test_files* + docs* + build* diff --git a/setup.py b/setup.py deleted file mode 100644 index 0fdc0d35..00000000 --- a/setup.py +++ /dev/null @@ -1,93 +0,0 @@ -#Copyright 2018 SuperDARN Canada, University of Saskatchewan -# Author(s): Marina Schmidt -# -# Disclaimer: -# pyDARN is under the LGPL v3 license found in the root directory LICENSE.md -# Everyone is permitted to copy and distribute verbatim copies of this license -# document, but changing it is not allowed. -# -# This version of the GNU Lesser General Public License incorporates the terms -# and conditions of version 3 of the GNU General Public License, -# supplemented by the additional permissions listed below. -# -# Modifications -# 2022-03-10 MTS - removed radar_fov files -#setup.py -#2018-11-05 -""" -To setup pyDARN as a third party library. Include installing need libraries for -running the files. -""" -import sys -import warnings - -from os import path -from setuptools import setup, find_namespace_packages -from setuptools.command.install import install, orig -from setuptools.command.develop import develop -from glob import glob -from subprocess import check_call - -class update_submodules(develop): - def run(self): - if path.exists('.git'): - check_call(['git', 'submodule', 'update', '--init', '--recursive']) - check_call(['git', 'submodule', 'update', '--recursive', '--remote']) - develop.run(self) - - -# This class and function overrides the install python -# setup method to add an extra git command in to install -# the submodule -class initialize_submodules(install): - def run(self): - if path.exists('.git'): - print("updating") - check_call(['git', 'submodule', 'update', '--init', '--recursive']) - check_call(['git', 'submodule', 'update', '--recursive', '--remote']) - if self.old_and_unmanageable or self.single_version_externally_managed: - return orig.install.run(self) - caller = sys._getframe(2) - caller_module = caller.f_globals.get('__name__', '') - caller_name = caller.f_code.co_name - if caller_module != 'distutils.dist' or caller_name != 'run_commands': - # We weren't called from the command line or setup(), so we - # should run in b`ackward-compatibility mode to support bdist_* - # commands. - orig.install.run(self) - else: - self.do_egg_install() - -this_directory = path.abspath(path.dirname(__file__)) -with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f: - long_description = f.read() - -exec(open('pydarn/version.py').read()) -warnings.warn("If you are going to use Fan, Grid, and/or Convection Map " - "plots, then make sure cartopy is installed on your machine. " - "If you do not need to use cartopy for your plotting, ignore " - "this message.") - -# Setup information -setup( - cmdclass={'install': initialize_submodules, 'develop': update_submodules}, - name="pydarn", - version=__version__, - long_description=long_description, - long_description_content_type='text/markdown', - description="Data visualization library for SuperDARN data", - url='https://pydarn.readthedocs.io/en/latest/', - classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'License :: OSI Approved :: GNU Lesser General Public License v3 (LGPLv3)', - 'Programming Language :: Python :: 3.6', - 'Programming Language :: Python :: 3.7'], - python_requires='>=3.6', - packages=find_namespace_packages(exclude=['docs', 'test']), - author="SuperDARN Data Visualization Working Group", - # used to import the logging config file into pydarn. - include_package_data=True, - # setup_requires=['pyyaml', 'numpy', 'matplotlib', 'aacgmv2'], - install_requires=['pyyaml', 'numpy', 'matplotlib>=3.3.4', 'aacgmv2', - 'pydarnio>=1.1.0'], -) From 71593078088f4252bc27da9384bb12856517e6f1 Mon Sep 17 00:00:00 2001 From: carleyjmartin Date: Tue, 21 Feb 2023 11:48:40 -0600 Subject: [PATCH 4/6] adding iceland radars --- pydarn/utils/superdarn_radars.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pydarn/utils/superdarn_radars.py b/pydarn/utils/superdarn_radars.py index a2f1c26d..c912a37e 100644 --- a/pydarn/utils/superdarn_radars.py +++ b/pydarn/utils/superdarn_radars.py @@ -13,6 +13,7 @@ # Modifications: # 2022-02-11 MTS USASK updated the _HDW_info class to take in # the hardware format +# 2023-01-21 CJM Added ICE and ICW defaults and hdw link """ This module contains SuperDARN radar information """ @@ -490,6 +491,10 @@ class SuperDARNRadars(): Hemisphere.North, 110, read_hdw_file('hok')), 41: _Radar('Hokkaido West', 'Nagoya University', Hemisphere.North, 110, read_hdw_file('hkw')), + 211: _Radar('Iceland East', 'Dartmouth College', + Hemisphere.North, 100, read_hdw_file('ice')), + 210: _Radar('Iceland West', 'Dartmouth College', + Hemisphere.North, 100, read_hdw_file('icw')), 64: _Radar('Inuvik', 'University of Saskatchewan', Hemisphere.North, 75, read_hdw_file('inv')), 50: _Radar('Jiamusi East radar', From 7c3b5da60fe9de6c1b2dd69e1e7455ceac0ba415 Mon Sep 17 00:00:00 2001 From: carleyjmartin Date: Tue, 21 Feb 2023 15:58:41 -0600 Subject: [PATCH 5/6] hdw submodule update --- pydarn/utils/hdw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pydarn/utils/hdw b/pydarn/utils/hdw index f3c8bcee..14406f1b 160000 --- a/pydarn/utils/hdw +++ b/pydarn/utils/hdw @@ -1 +1 @@ -Subproject commit f3c8bceeac763146aa7c5eb209277034b3a6b7e2 +Subproject commit 14406f1be51374f536842976568ea0fc656f8a20 From a4faefbde34e0bec0d98afb8e419f4d4d66b3487 Mon Sep 17 00:00:00 2001 From: carleyjmartin Date: Mon, 13 Mar 2023 10:49:49 -0600 Subject: [PATCH 6/6] prerelease checklist --- README.md | 8 ++++++-- pydarn/version.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 992bfdeb..b9e3c51d 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,13 @@ Python data visualization library for the Super Dual Auroral Radar Network (Supe ## Changelog -## Version 3.1 - Release! +## Version 3.1.1 - Patch Release! -pyDARN release v3.1 includes the following features: +This patch release includes: +- **Bug fix** `hdw` repository installation issues resolved +- Inclusion of ICE and ICW in `hdw` repository and superdarn_radars module + +Most recent minor release (3.1.0) changes listed below: - Full Cartopy coastline plotting options for all spatial plots - **NEW** `coastline` keyword in method calls - Full Cartopy integration for plotting in geographic coordinates for grid and fan plots diff --git a/pydarn/version.py b/pydarn/version.py index 4b2d39bb..ede71411 100644 --- a/pydarn/version.py +++ b/pydarn/version.py @@ -17,4 +17,4 @@ This file contains the version number of pydarn """ -__version__='3.1' +__version__='3.1.1'