* Add CI jenkins script to trigger builds in lsstts jenkins server.

tribeiro · tribeiro · commit 4cbce21bfc43 · 2021-06-03T13:34:16.000-07:00
* Update setup.py to improve compatibility with conda build.
* Remove init files from test folder to improve compatibility with conda build.
* Fix rubin_sim/maf/mafContrib/n_galactic_stars.py run method definition.
* Update the following unit tests to be compatible with conda build.
	* tests/photUtils/test_BandpassDict.py
	* tests/photUtils/test_Photometry.py
	* tests/photUtils/test_Sed.py
	* tests/photUtils/test_SedList.py
	* tests/photUtils/test_SNR.py
	* tests/utils/test_ModifiedJulianDate.py
	* tests/utils/test_Trixel.py
diff --git a/ci/Jenkinsfile_rubin_sim.conda b/ci/Jenkinsfile_rubin_sim.conda
@@ -0,0 +1,2 @@
+@Library('JenkinsShared')_
+ExternalCondaPipeline("rubin-sim")
diff --git a/rubin_sim/maf/mafContrib/n_galactic_stars.py b/rubin_sim/maf/mafContrib/n_galactic_stars.py
@@ -15,3 +15,4 @@ def __init__(self, filtername='r', filterCol='filter'):
 
     def run(self, dataSlice, slicePoint=None):
 
+        pass
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,17 @@
+[flake8]
+max-line-length = 110
+max-doc-length = 79
+ignore = E133, E226, E228, N802, N803, N806, N812, N813, N815, N816, W503
+exclude =
+  doc/**,
+  bin/**,
+  **/*/__init__.py,
+  **/*/version.py,
+  tests/.tests
+
+[tool:pytest]
+addopts = --flake8 --black
+flake8-ignore = E133 E226 E228 N802 N803 N806 N812 N813 N815 N816 W503
+
+[metadata]
+version = attr: setuptools_scm.get_version
diff --git a/setup.py b/setup.py
@@ -1,14 +1,31 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
-setup(name='rubin_sim',
-      version='0.01',
-      scripts=['bin/maf/addRun', 'bin/maf/glance_dir',
-               'bin/maf/maf_night_report', 'bin/maf/scimaf_dir',
-               'bin/maf/showMaf', 'bin/maf/generate_ss',
-               'bin/maf/run_moving_calc', 'bin/maf/run_moving_fractions',
-               'bin/maf/run_moving_join',
-               'bin/movingObjects/makeLSSTobs', 'bin/movingObjects/addSeds',
-               'bin/movingObjects/generateCoefficients',
-               'bin/rs_download_data'],
-      packages=['rubin_sim', ],
-      )
+scm_version_template = """# Generated by setuptools_scm
+__all__ = ["__version__"]
+
+__version__ = "{version}"
+"""
+
+setup(
+    name="rubin_sim",
+    use_scm_version={
+        "write_to": "rubin_sim/version.py",
+        "write_to_template": scm_version_template,
+    },
+    scripts=[
+        "bin/maf/addRun",
+        "bin/maf/glance_dir",
+        "bin/maf/maf_night_report",
+        "bin/maf/scimaf_dir",
+        "bin/maf/showMaf",
+        "bin/maf/generate_ss",
+        "bin/maf/run_moving_calc",
+        "bin/maf/run_moving_fractions",
+        "bin/maf/run_moving_join",
+        "bin/movingObjects/makeLSSTobs",
+        "bin/movingObjects/addSeds",
+        "bin/movingObjects/generateCoefficients",
+        "bin/rs_download_data",
+    ],
+    packages=find_packages(),
+)
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/photUtils/test_BandpassDict.py b/tests/photUtils/test_BandpassDict.py
@@ -4,7 +4,6 @@
 import numpy as np
 from rubin_sim.photUtils import Bandpass, Sed, BandpassDict, SedList
 from rubin_sim.data import get_data_dir
-from rubin_sim.utils import getPackageDir
 import rubin_sim
 
 
@@ -14,7 +13,7 @@ def setUp(self):
         self.rng = np.random.RandomState(32)
         self.bandpassPossibilities = ['u', 'g', 'r', 'i', 'z', 'y']
         self.bandpassDir = os.path.join(get_data_dir(), 'throughputs', 'baseline')
-        self.sedDir = os.path.join(getPackageDir(rubin_sim), 'tests', 'photUtils',
+        self.sedDir = os.path.join('tests', 'photUtils',
                                    'cartoonSedTestData/galaxySed')
         self.sedPossibilities = os.listdir(self.sedDir)
 
@@ -662,7 +661,7 @@ def testLoadTotalBandpassesFromFiles(self):
         expected result
         """
 
-        bandpassDir = os.path.join(getPackageDir(rubin_sim), 'tests', 'photUtils',
+        bandpassDir = os.path.join('tests', 'photUtils',
                                    'cartoonSedTestData')
         bandpassNames = ['g', 'r', 'u']
         bandpassRoot = 'test_bandpass_'
@@ -697,7 +696,7 @@ def testLoadBandpassesFromFiles(self):
         expected result
         """
 
-        fileDir = os.path.join(getPackageDir(rubin_sim), 'tests', 'photUtils',
+        fileDir = os.path.join('tests', 'photUtils',
                                'cartoonSedTestData')
         bandpassNames = ['g', 'z', 'i']
         bandpassRoot = 'test_bandpass_'
diff --git a/tests/photUtils/test_Photometry.py b/tests/photUtils/test_Photometry.py
@@ -2,7 +2,7 @@
 
 import os
 import unittest
-from rubin_sim.utils import ObservationMetaData, getPackageDir
+from rubin_sim.utils import ObservationMetaData
 from rubin_sim.utils.CodeUtilities import sims_clean_up
 from rubin_sim.photUtils.Bandpass import Bandpass
 from rubin_sim.photUtils.Sed import Sed
@@ -36,9 +36,7 @@ def testAlternateBandpassesStars(self):
         that some default value did not change and the code actually ended up loading the
         LSST bandpasses.
         """
-        package_dir = getPackageDir(rubin_sim)
-
-        bandpassDir = os.path.join(package_dir, 'tests/photUtils', 'cartoonSedTestData')
+        bandpassDir = os.path.join('tests', 'photUtils', 'cartoonSedTestData')
 
         cartoon_dict = BandpassDict.loadTotalBandpassesFromFiles(['u', 'g', 'r', 'i', 'z'],
                                                                  bandpassDir=bandpassDir,
@@ -57,7 +55,7 @@ def testAlternateBandpassesStars(self):
         sedObj = Sed()
         phiArray, waveLenStep = sedObj.setupPhiArray(bplist)
 
-        sedFileName = os.path.join(package_dir, 'tests/photUtils',
+        sedFileName = os.path.join('tests/photUtils',
                                    'cartoonSedTestData/starSed/')
         sedFileName = os.path.join(sedFileName, 'kurucz', 'km20_5750.fits_g40_5790.gz')
         ss = Sed()
diff --git a/tests/photUtils/test_SNR.py b/tests/photUtils/test_SNR.py
@@ -6,16 +6,13 @@
 from rubin_sim.photUtils import Sed, Bandpass, PhotometricParameters, LSSTdefaults
 from rubin_sim.photUtils.utils import setM5
 import rubin_sim
-from rubin_sim.utils import getPackageDir
 from rubin_sim.data import get_data_dir
 
 class TestSNRmethods(unittest.TestCase):
 
     def setUp(self):
 
-        package_dir = getPackageDir(rubin_sim)
-        starName = os.path.join(package_dir,
-                                'tests/photUtils/cartoonSedTestData/starSed/')
+        starName = os.path.join('tests', 'photUtils', 'cartoonSedTestData', 'starSed')
         starName = os.path.join(starName, 'kurucz', 'km20_5750.fits_g40_5790.gz')
         self.starSED = Sed()
         self.starSED.readSED_flambda(starName)
@@ -113,7 +110,7 @@ def testSignalToNoise(self):
                       self.hardwareList[i],
                       photParams, FWHMeff=defaults.FWHMeff(self.filterNameList[i])))
 
-        sedDir = os.path.join(getPackageDir(rubin_sim), 'tests/photUtils',
+        sedDir = os.path.join('tests', 'photUtils',
                               'cartoonSedTestData/starSed/')
         sedDir = os.path.join(sedDir, 'kurucz')
         fileNameList = os.listdir(sedDir)
diff --git a/tests/photUtils/test_Sed.py b/tests/photUtils/test_Sed.py
@@ -10,7 +10,6 @@
 import rubin_sim.photUtils.Bandpass as Bandpass
 from rubin_sim.photUtils import PhotometricParameters
 import rubin_sim
-from rubin_sim.utils import getPackageDir
 
 ROOT = os.path.abspath(os.path.dirname(__file__))
 
@@ -173,7 +172,7 @@ def test_eq(self):
         """
         Test that __eq__ in Sed works correctly
         """
-        sed_dir = os.path.join(getPackageDir(rubin_sim), 'tests/photUtils',
+        sed_dir = os.path.join('tests', 'photUtils',
                                'cartoonSedTestData', 'starSed', 'kurucz')
         list_of_seds = os.listdir(sed_dir)
         sedname1 = os.path.join(sed_dir, list_of_seds[0])
@@ -203,7 +202,7 @@ def test_cache(self):
         with readSED_flambda, it should get stored in the
         _global_misc_sed_cache)
         """
-        sed_dir = os.path.join(getPackageDir(rubin_sim), 'tests/photUtils',
+        sed_dir = os.path.join('tests', 'photUtils',
                                'cartoonSedTestData', 'starSed', 'kurucz')
 
         sed_name_list = os.listdir(sed_dir)
diff --git a/tests/photUtils/test_SedList.py b/tests/photUtils/test_SedList.py
@@ -4,16 +4,14 @@
 
 from rubin_sim.photUtils import Bandpass, Sed, SedList
 import rubin_sim
-from rubin_sim.utils import getPackageDir
 from rubin_sim.data import get_data_dir
 
 
 class SedListTest(unittest.TestCase):
 
     def setUp(self):
         self.rng = np.random.RandomState(18233)
-        self.sedDir = os.path.join(getPackageDir(rubin_sim),
-                                   'tests/photUtils/cartoonSedTestData/galaxySed/')
+        self.sedDir = os.path.join('tests', 'photUtils', 'cartoonSedTestData', 'galaxySed')
         self.sedPossibilities = os.listdir(self.sedDir)
 
     def getListOfSedNames(self, nNames):
diff --git a/tests/site_models/__init__.py b/tests/site_models/__init__.py
diff --git a/tests/utils/testModules/__init__.py b/tests/utils/testModules/__init__.py
diff --git a/tests/utils/test_ModifiedJulianDate.py b/tests/utils/test_ModifiedJulianDate.py
@@ -5,7 +5,7 @@
 import os
 import copy
 import inspect
-from rubin_sim.utils import ModifiedJulianDate, UTCtoUT1Warning, getPackageDir
+from rubin_sim.utils import ModifiedJulianDate, UTCtoUT1Warning
 import rubin_sim
 
 
@@ -27,7 +27,7 @@ def test_tai_from_utc(self):
         API changes in astropy.
         """
 
-        file_name = os.path.join(getPackageDir(rubin_sim), 'tests', 'utils')
+        file_name = os.path.join('tests', 'utils')
         file_name = os.path.join(file_name, 'testData', 'utc_tai_comparison_data.txt')
 
         dtype = np.dtype([('utc', float), ('tai', float)])
diff --git a/tests/utils/test_Trixel.py b/tests/utils/test_Trixel.py
@@ -15,7 +15,7 @@
 
 from rubin_sim.utils import sphericalFromCartesian, cartesianFromSpherical
 from rubin_sim.utils import rotAboutY, rotAboutX, rotAboutZ
-from rubin_sim.utils import angularSeparation, _angularSeparation, getPackageDir
+from rubin_sim.utils import angularSeparation, _angularSeparation
 import rubin_sim
 
 
@@ -536,8 +536,8 @@ def test_against_fatboy(self):
         Test findHtmid against a random selection of stars from fatboy
         """
         dtype = np.dtype([('htmid', int), ('ra', float), ('dec', float)])
-        data = np.genfromtxt(os.path.join(getPackageDir(rubin_sim), 'tests',
-                                          'utils/testData', 'htmid_test_data.txt'),
+        data = np.genfromtxt(os.path.join('tests',
+                                          'utils', 'testData', 'htmid_test_data.txt'),
                              dtype=dtype)
         self.assertGreater(len(data), 20)
         for i_pt in range(len(data)):

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@Library('JenkinsShared')_`
	`2`	`+ExternalCondaPipeline("rubin-sim")`
Original file line number	Diff line number	Diff line change
`@@ -15,3 +15,4 @@ def __init__(self, filtername='r', filterCol='filter'):`
`15`	`15`
`16`	`16`	`def run(self, dataSlice, slicePoint=None):`
`17`	`17`
	`18`	`+ pass`