From d3e98e1a7827276f124da82e6d0e966905ae5d7b Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Thu, 19 Jul 2018 22:41:30 -0700 Subject: [PATCH 1/2] Some deep changes to test new tree fetching. --- CONTRIBUTING.md | 2 +- astropy/config/tests/data/not_empty.cfg | 2 +- astropy/extern/six.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4545225..c24e7f7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,7 @@ Contributing to Astropy ======================= -Some changes that we'll try to merge. +Some changes that we'll try to merge. I guess that worked? Reporting Issues ---------------- diff --git a/astropy/config/tests/data/not_empty.cfg b/astropy/config/tests/data/not_empty.cfg index c7a660f..60cbd7d 100644 --- a/astropy/config/tests/data/not_empty.cfg +++ b/astropy/config/tests/data/not_empty.cfg @@ -12,4 +12,4 @@ ## Threshold for the logging messages. Logging messages that are less severe ## than this level will be ignored. The levels are 'DEBUG', 'INFO', 'WARNING', ## 'ERROR' -log_level = INFO +log_level = WARNING diff --git a/astropy/extern/six.py b/astropy/extern/six.py index ea002d4..d41542e 100644 --- a/astropy/extern/six.py +++ b/astropy/extern/six.py @@ -1,7 +1,7 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst """ -Handle loading six package from system or from the bundled copy +Handle loading seven packages from system or from the bundled copy """ import imp From 980492db0fd0ea14ae7cfa0a9d1c9c22115f8176 Mon Sep 17 00:00:00 2001 From: Piotr Kaminski Date: Thu, 19 Jul 2018 22:43:28 -0700 Subject: [PATCH 2/2] Undo a deep change. --- astropy/config/tests/data/not_empty.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astropy/config/tests/data/not_empty.cfg b/astropy/config/tests/data/not_empty.cfg index 60cbd7d..c7a660f 100644 --- a/astropy/config/tests/data/not_empty.cfg +++ b/astropy/config/tests/data/not_empty.cfg @@ -12,4 +12,4 @@ ## Threshold for the logging messages. Logging messages that are less severe ## than this level will be ignored. The levels are 'DEBUG', 'INFO', 'WARNING', ## 'ERROR' -log_level = WARNING +log_level = INFO