Merge pull request #129 from brittonsmith/legup

Prepare legacy branch for parking
trident-project · Apr 23, 2020 · 575717c · 575717c
2 parents 542af18 + 6eb2da6
commit 575717c
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 65 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,7 +9,7 @@ commands:
           echo 'TRIDENT_ION_DATA=$HOME/.trident' >> $BASH_ENV
           echo 'TRIDENT_ANSWER_DATA=$HOME/answer_test_data' >> $BASH_ENV
           echo 'TRIDENT_CONFIG=$HOME/.trident/config.tri' >> $BASH_ENV
-          echo 'YT_GOLD=6692802ea1bf7b4fbb6b0bc207aaea14730eec84' >> $BASH_ENV
+          echo 'YT_GOLD=yt-3.6.0' >> $BASH_ENV
           echo 'YT_HEAD=master' >> $BASH_ENV
           echo 'TRIDENT_GOLD=test-standard-v6' >> $BASH_ENV
           echo 'TRIDENT_HEAD=tip' >> $BASH_ENV
@@ -45,7 +45,7 @@ commands:
               pushd $YT_DIR
               # return to yt tip before pulling
               git checkout ${YT_HEAD}
-              git pull origin ${YT_HEAD}
+              git pull origin ${YT_HEAD} --tag
               # checkout changeset we're actually testing
               git checkout ${<< parameters.yttag >>}
               pip install -e .
@@ -166,15 +166,15 @@ jobs:
 
       - restore_cache:
           name: "Restore dependencies cache."
-          key: legacy-<< parameters.tag >>-dependencies-v2
+          key: legacy-<< parameters.tag >>-dependencies-v3
 
       - install-dependencies:
           yttag: << parameters.yttag >>
       - configure-trident
 
       - save_cache:
           name: "Save dependencies cache."
-          key: legacy-<< parameters.tag >>-dependencies-v2
+          key: legacy-<< parameters.tag >>-dependencies-v3
           paths:
             - ~/.cache/pip
             - ~/venv
@@ -198,14 +198,14 @@ jobs:
 
       - restore_cache:
           name: "Restore answer tests cache."
-          key: legacy-results-<< parameters.tag >>-<< parameters.yttag >>-v4
+          key: legacy-results-<< parameters.tag >>-<< parameters.yttag >>-v5
 
       - run-tests:
           generate: 1
 
       - save_cache:
           name: "Save answer tests cache."
-          key: legacy-results-<< parameters.tag >>-<< parameters.yttag >>-v4
+          key: legacy-results-<< parameters.tag >>-<< parameters.yttag >>-v5
           paths:
             - ~/answer_test_data/test_results
 
@@ -244,46 +244,15 @@ workflows:
            name: "Python 3.5 tests with yt gold"
            tag: "3.5.9"
 
-       - tests:
-           name: "Python 3.6 tests with yt gold"
-           tag: "3.6.9"
-
-       - tests:
-           name: "Python 3.7 tests with yt gold"
-           tag: "3.7.6"
-
        - tests:
            name: "Python 3.8 tests with yt gold"
-           tag: "3.8.1"
-
-       - tests:
-           name: "Python 3.8 tests with yt tip"
-           tag: "3.8.1"
-           yttag: "YT_HEAD"
+           tag: "3.8.2"
+           yttag: "YT_GOLD"
            coverage: 1
 
        - docs-test:
            name: "Test docs build"
-           tag: "3.8.1"
-
-   daily:
-     triggers:
-       - schedule:
-           cron: "0 0 * * *"
-           filters:
-            branches:
-              only:
-                - master
-     jobs:
-       - tests:
-           name: "Python 3.8 tests with yt tip"
-           tag: "3.8.1"
-           yttag: "YT_HEAD"
-           coverage: 0
-
-       - docs-test:
-           name: "Test docs build"
-           tag: "3.8.1"
+           tag: "3.8.2"
 
    weekly:
      triggers:
@@ -295,11 +264,21 @@ workflows:
                 - legacy
      jobs:
        - tests:
-           name: "Python 3.8 tests with yt tip"
-           tag: "3.8.1"
-           yttag: "YT_HEAD"
-           coverage: 0
+           name: "Python 3.5 tests with yt gold"
+           tag: "3.5.9"
+
+       - tests:
+           name: "Python 3.6 tests with yt gold"
+           tag: "3.6.10"
+
+       - tests:
+           name: "Python 3.7 tests with yt gold"
+           tag: "3.7.7"
+
+       - tests:
+           name: "Python 3.8 tests with yt gold"
+           tag: "3.8.2"
 
        - docs-test:
            name: "Test docs build"
-           tag: "3.8.1"
+           tag: "3.8.2"
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -12,7 +12,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from __future__ import absolute_import
 import sys
 import os
 import shlex

diff --git a/environment.yml b/environment.yml
@@ -11,7 +11,6 @@ dependencies:
     - cycler==0.10.0
     - cython==0.29.13
     - decorator==4.4.0
-    - future==0.17.1
     - h5py==2.9.0
     - idna==2.8
     - ipython==7.7.0
@@ -30,7 +29,6 @@ dependencies:
     - pyparsing==2.4.2
     - python-dateutil==2.8.0
     - requests==2.22.0
-    - six==1.12.0
     - sympy==1.4
     - traitlets==4.3.2
     - urllib3==1.25.3

diff --git a/setup.py b/setup.py
@@ -59,12 +59,11 @@ def get_version(filename):
       },
     install_requires=[
         'astropy',
-        'future',
         'h5py',
         'matplotlib',
         'numpy!=1.14.0',
         'requests',
-        'yt>=3.4.0',
+        'yt>=3.6.0,<4.0',
         'yt_astro_analysis'],
       python_requires='>=3.5'
 )
diff --git a/tests/gold_standard_versions.py b/tests/gold_standard_versions.py
@@ -11,12 +11,11 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from __future__ import print_function
 from trident import path as trident_path
 import os
 
 def get_gold_standard_version():
-    f = open(os.path.join(trident_path, '../.travis.yml'), 'r')
+    f = open(os.path.join(trident_path, '../.circleci/config.yml'), 'r')
     for line in f:
         line = line.lstrip()
         if line.startswith('YT_GOLD'):

diff --git a/tests/test_instrument.py b/tests/test_instrument.py
@@ -11,8 +11,6 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from __future__ import absolute_import
-from __future__ import print_function
 from trident.instrument import Instrument
 
 def test_instrument():

diff --git a/tests/test_ion_balance.py b/tests/test_ion_balance.py
@@ -11,7 +11,6 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from __future__ import absolute_import
 from trident.ion_balance import \
     add_ion_fraction_field, \
     add_ion_number_density_field, \

diff --git a/tests/test_line_database.py b/tests/test_line_database.py
@@ -11,8 +11,6 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from __future__ import absolute_import
-from __future__ import print_function
 from trident.line_database import \
     uniquify, \
     Line, \
@@ -22,7 +20,6 @@
 import numpy as np
 from shutil import copyfile
 import os.path
-from six.moves import range
 
 def test_uniquify():
     """

diff --git a/tests/test_lsf.py b/tests/test_lsf.py
@@ -11,8 +11,6 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from __future__ import absolute_import
-from __future__ import print_function
 import pytest
 from trident.lsf import LSF
 import numpy as np

diff --git a/tests/test_plotting.py b/tests/test_plotting.py
@@ -11,7 +11,6 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from __future__ import absolute_import
 from trident.plotting import plot_spectrum
 from trident.utilities import make_onezone_ray
 from trident.spectrum_generator import \

diff --git a/tests/test_ray_generator.py b/tests/test_ray_generator.py
@@ -11,7 +11,6 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from __future__ import absolute_import
 import trident as tri
 import tempfile
 import shutil

diff --git a/tests/test_spectrum_generator.py b/tests/test_spectrum_generator.py
@@ -11,7 +11,6 @@
 # The full license is in the file LICENSE, distributed with this software.
 #-----------------------------------------------------------------------------
 
-from __future__ import absolute_import
 from trident.plotting import plot_spectrum
 from trident.utilities import make_onezone_ray
 from trident.spectrum_generator import \

diff --git a/trident/absorption_spectrum/absorption_spectrum.py b/trident/absorption_spectrum/absorption_spectrum.py
@@ -5,8 +5,6 @@
 
 """
 
-from __future__ import absolute_import
-
 #-----------------------------------------------------------------------------
 # Copyright (c) 2013-2017, yt Development Team.
 # Copyright (c) 2017, Trident Development Team.