Updated system info and extern packages (#5175)

Co-authored-by: Stuart Mumford <stuart@cadair.com>
sunpy · Apr 8, 2021 · 0df8534 · 0df8534
1 parent ca2cecb
commit 0df8534
Show file tree

Hide file tree

Showing 10 changed files with 779 additions and 789 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -126,7 +126,7 @@ stages:
 
             - linux: py38-devdeps
 
-            - linux: py38-base_deps
+            - linux: base_deps
 
   # On branches which aren't master, and not Pull Requests, build the wheels but only upload them on tags
   - ${{ if and(ne(variables['Build.Reason'], 'PullRequest'), or(ne(variables['Build.SourceBranchName'], 'master'), eq(variables['Build.Reason'], 'Schedule'), eq(variables['Build.Reason'], 'Manual'))) }}:

diff --git a/changelog/5175.feature.rst b/changelog/5175.feature.rst
@@ -0,0 +1 @@
+Updated `sunpy.util.sysinfo.system_info` to return all optional dependencies of sunpy.
diff --git a/docs/conf.py b/docs/conf.py
@@ -9,7 +9,7 @@
 import os
 import sys
 import datetime
-from pkg_resources import get_distribution, DistributionNotFound
+from pkg_resources import get_distribution
 from packaging.version import Version
 
 # -- Check for dependencies ----------------------------------------------------

diff --git a/sunpy/extern/appdirs.py b/sunpy/extern/appdirs.py
@@ -75,7 +75,7 @@ def user_data_dir(appname=None, appauthor=None, version=None, roaming=False):
     if system == "win32":
         if appauthor is None:
             appauthor = appname
-        const = roaming and "CSIDL_APPDATA" or "CSIDL_LOCAL_APPDATA"
+        const = "CSIDL_APPDATA" if roaming else "CSIDL_LOCAL_APPDATA"
         path = os.path.normpath(_get_win_folder(const))
         if appname:
             if appauthor is not False: