AstroToolkit 1.3.2__tar.gz → 1.3.4__tar.gz

{AstroToolkit-1.3.2/src/AstroToolkit.egg-info → AstroToolkit-1.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: AstroToolkit
-Version: 1.3.2
+Version: 1.3.4
 Summary: A package for the gathering and plotting of astronomical data.
 Author-email: Ethan Moorfield <ethan.moorfield@hotmail.co.uk>
 Project-URL: Homepage, https://github.com/WD-planets/AstroToolkit
@@ -10,21 +10,22 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: astropy
-Requires-Dist: astroquery
-Requires-Dist: bokeh>=3.1.1
-Requires-Dist: cmasher
-Requires-Dist: importlib_resources
-Requires-Dist: matplotlib
-Requires-Dist: numba
-Requires-Dist: numpy
-Requires-Dist: pandas
-Requires-Dist: Pillow
-Requires-Dist: PyQt5
-Requires-Dist: PyQt5_sip
-Requires-Dist: Requests
-Requires-Dist: scikit_learn
-Requires-Dist: scipy
+Requires-Dist: astropy==5.2.2
+Requires-Dist: astroquery==0.4.7
+Requires-Dist: bokeh==3.1.1
+Requires-Dist: cmasher==1.6.3
+Requires-Dist: importlib_resources==6.4.0
+Requires-Dist: matplotlib==3.7.5
+Requires-Dist: numba==0.58.1
+Requires-Dist: numpy==1.24.4
+Requires-Dist: pandas==2.0.3
+Requires-Dist: Pillow==10.2.0
+Requires-Dist: PyQt5==5.15.10
+Requires-Dist: PyQt5_sip==12.13.0
+Requires-Dist: Requests==2.31.0
+Requires-Dist: scikit_learn==1.3.2
+Requires-Dist: scipy==1.10.1
+Requires-Dist: selenium==4.17.2
 
 # AstroToolkit
 

{AstroToolkit-1.3.2 → AstroToolkit-1.3.4}/pyproject.toml

@@ -7,7 +7,7 @@ include-package-data = true
 
 [project]
 name = "AstroToolkit"
-version = "1.3.2"
+version = "1.3.4"
 authors = [
   { name="Ethan Moorfield", email="ethan.moorfield@hotmail.co.uk"},
 ]
@@ -19,21 +19,22 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
-    "astropy",
-    "astroquery",
-    "bokeh>=3.1.1",
-    "cmasher",
-    "importlib_resources",
-    "matplotlib",
-    "numba",
-    "numpy",
-    "pandas",
-    "Pillow",
-    "PyQt5",
-    "PyQt5_sip",
-    "Requests",
-    "scikit_learn",
-    "scipy",
+    "astropy==5.2.2",
+    "astroquery==0.4.7",
+    "bokeh==3.1.1",
+    "cmasher==1.6.3",
+    "importlib_resources==6.4.0",
+    "matplotlib==3.7.5",
+    "numba==0.58.1",
+    "numpy==1.24.4",
+    "pandas==2.0.3",
+    "Pillow==10.2.0",
+    "PyQt5==5.15.10",
+    "PyQt5_sip==12.13.0",
+    "Requests==2.31.0",
+    "scikit_learn==1.3.2",
+    "scipy==1.10.1",
+    "selenium==4.17.2"
 ]
 
 [project.urls]

{AstroToolkit-1.3.2 → AstroToolkit-1.3.4}/src/AstroToolkit/Data/lightcurves.py

@@ -188,8 +188,7 @@ def get_data(survey,ra,dec,radius=3,source=None,pos=None,username=None,password=
 			headers={'Authorization':f'Token {token}','Accept':'application/json'}
 			
 		else:
-			print(f'ERROR {r.status_code}.')
-			print(r.json())
+			print(f'Note: Experiencing issues with ATLAS')
 			return f_return
 			
 		task_url=None
@@ -220,9 +219,8 @@ def get_data(survey,ra,dec,radius=3,source=None,pos=None,username=None,password=
 					print(f'Waiting {waittime} seconds.')
 					time.sleep(waittime)
 				else:
-					print(f'ERROR {r.status_code}')
-					print(r.json())
-					sys.exit()
+					print(f'Note: Experiencing issues with ATLAS')
+					return f_return
 					
 		result_url=None
 		while not result_url:
@@ -241,9 +239,8 @@ def get_data(survey,ra,dec,radius=3,source=None,pos=None,username=None,password=
 					time.sleep(10)
 				
 				else:
-					print(f'ERROR {r.status_code}')
-					print(r.json())
-					sys.exit()
+					print(f'Note: Experiencing issues with ATLAS')
+					return f_return
 					
 		with requests.Session() as s:
 			textdata=s.get(result_url,headers=headers).text

{AstroToolkit-1.3.2 → AstroToolkit-1.3.4}/src/AstroToolkit/Data/spectra.py

@@ -11,7 +11,7 @@ def get_spectrum_data(survey,ra,dec,radius=3,source=None,pos=None):
 		radius=radius/3600*u.deg
 
 		# fetches data
-		data=SDSS.get_spectra(position,radius,timeout=120)
+		data=SDSS.get_spectra(coordinates=position,radius=radius,timeout=120)
 		if data!=None:
 			data=data[0][1]
 

{AstroToolkit-1.3.2 → AstroToolkit-1.3.4}/src/AstroToolkit/Misc/file_handling.py

@@ -201,7 +201,7 @@ def create_file(data_copy):
 
         df.to_csv(fname,index=False)
 
-    # if data type is a list (e.g. lightcurves)
+    # if data type is a lightcurve
     if file_type=='lightcurve':
         source=None
         ra,dec=None,None

{AstroToolkit-1.3.2 → AstroToolkit-1.3.4}/src/AstroToolkit/Plotting/HRD.py

@@ -80,7 +80,7 @@ def get_plot(source=None,sources=None):
 		y=gmag+5*np.log10(parallax/1000)+5
 		
 		if not math.isnan(gmag) and not math.isnan(bpmag) and not math.isnan(rpmag) and not math.isnan(parallax):
-			plot.scatter(x=x,y=y,marker='square_dot',line_color='black',fill_color=None,size=20,line_width=2,legend_label='Source')
+			plot.scatter(x=x,y=y,marker='square_dot',line_color='black',fill_color=None,size=20,line_width=2,legend_label='Source',level='overlay')
 		else:
 			return None
 	
@@ -93,7 +93,7 @@ def get_plot(source=None,sources=None):
 			y=gmag+5*np.log10(parallax/1000)+5
 			
 			if not math.isnan(gmag) and not math.isnan(bpmag) and not math.isnan(rpmag) and not math.isnan(parallax):
-				plot.scatter(x=x,y=y,marker='square_dot',line_color='black',fill_color=None,size=20,line_width=2,legend_label='Source')
+				plot.scatter(x=x,y=y,marker='square_dot',line_color='black',fill_color=None,size=10,line_width=2,legend_label='Sources',level='overlay')
 			else:
 				pass
 

{AstroToolkit-1.3.2 → AstroToolkit-1.3.4}/src/AstroToolkit/Tools.py

@@ -1,35 +1,22 @@
 '''
 Changelog:
-- added example of config editing to README
-- fixed a bug with ATLAS lightcurves very rarely returning empty arrays which led to a crash
-- fixed a bug with lightcurve file naming
-- improved readfits functionality, can now set default source and ra/dec column names using config or from commandline, and prints similar column names if it couldn't find the given ones.
-- added support for CRTS lightcurves to lightcurvequery
-- added support for CRTS lightcurves as tracers in imaging overlays
-- added note to README about tracers and which ones are 'true' tracers (ztf and crts), and add an example image of wolf 28 being traced by crts
-- added crts to readme (lightcurvequery and overlays)
-- improved clarity of input description in coord conversion tools in README
-- added a getconfigvalue tool that fetches the current value of a given config parameter
-- added a getcolumn tool that can be used to grab any column from a .fits file
-- added comments throughout main Tools.py source code
-- other bug fixes
-- plots are now stored as part of a dictionary which stores the plot, as well as basic information such as the survey,source,pos, and type
-	- updated showplot, saveplot and export tools so that there is no difference in functionality with the above change
-- Now needs BS4, but this should be included already as it is required by astroquery
-- updated data dictionaries (returned by dataquery,photquery,spectrumquery, etc.) to be more in line with plot dictionaries returned by plotting tools when returning None
-- made spectra legends double-clickable in line with other ATK plots
-- improved grid functionality (for datapage creation) in many ways
+- Minor ATLAS error handling improvements
+- fixed dependencies in requirements.txt
 '''
 
 '''
 To-Do:
 HIGH PRIORITY
+- specify versions in requirements
+- check config for if all keys are present, if not then make a new config file with current keys saved
+- talk to boris about combining lightcurves
 - update README to reflect new changes (plots stored as dictionaries, showplot/saveplot/export now required to use on ATK plot objects, updated grid functionality)
 
 - fix issues with links in github/pypi not working (the ones on github are just me forgetting to format them properly), I think if possible just list features in pypi and have link to github 
   for actual documentation. Not sure if external people (i.e. those outside WDPlanets) can definitely view this repository though?
   
 MEDIUM PRIORITY
+- could combine all plotting tools into a central plot function, which then uses the 'type' stored in data dicts to plot it automatically
 - add defaults for newly supported surveys to metadata table
 - comment new code
 - 'plot has no renderer' bokeh warning
@@ -689,7 +676,7 @@ def gridsetup(dimensions,plots,grid_size=None):
 
 	# enables notifications of currently running tool if enabled in config
 	if config['ENABLE_NOTIFICATIONS']==1:
-		print(f'Creating grid...{newline}width = {dimensions[0]}{newline}height = {dimensions[1]}{newline}grid_size = {grid_size}{newline}')
+		print(f'Creating grid...{newline}width = {dimensions["width"]}{newline}height = {dimensions["height"]}{newline}grid_size = {grid_size}{newline}')
 
 	from .Datapages.grid import get_grid
 	

{AstroToolkit-1.3.2 → AstroToolkit-1.3.4/src/AstroToolkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: AstroToolkit
-Version: 1.3.2
+Version: 1.3.4
 Summary: A package for the gathering and plotting of astronomical data.
 Author-email: Ethan Moorfield <ethan.moorfield@hotmail.co.uk>
 Project-URL: Homepage, https://github.com/WD-planets/AstroToolkit
@@ -10,21 +10,22 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: astropy
-Requires-Dist: astroquery
-Requires-Dist: bokeh>=3.1.1
-Requires-Dist: cmasher
-Requires-Dist: importlib_resources
-Requires-Dist: matplotlib
-Requires-Dist: numba
-Requires-Dist: numpy
-Requires-Dist: pandas
-Requires-Dist: Pillow
-Requires-Dist: PyQt5
-Requires-Dist: PyQt5_sip
-Requires-Dist: Requests
-Requires-Dist: scikit_learn
-Requires-Dist: scipy
+Requires-Dist: astropy==5.2.2
+Requires-Dist: astroquery==0.4.7
+Requires-Dist: bokeh==3.1.1
+Requires-Dist: cmasher==1.6.3
+Requires-Dist: importlib_resources==6.4.0
+Requires-Dist: matplotlib==3.7.5
+Requires-Dist: numba==0.58.1
+Requires-Dist: numpy==1.24.4
+Requires-Dist: pandas==2.0.3
+Requires-Dist: Pillow==10.2.0
+Requires-Dist: PyQt5==5.15.10
+Requires-Dist: PyQt5_sip==12.13.0
+Requires-Dist: Requests==2.31.0
+Requires-Dist: scikit_learn==1.3.2
+Requires-Dist: scipy==1.10.1
+Requires-Dist: selenium==4.17.2
 
 # AstroToolkit
 

AstroToolkit-1.3.4/src/AstroToolkit.egg-info/requires.txt

@@ -0,0 +1,16 @@
+astropy==5.2.2
+astroquery==0.4.7
+bokeh==3.1.1
+cmasher==1.6.3
+importlib_resources==6.4.0
+matplotlib==3.7.5
+numba==0.58.1
+numpy==1.24.4
+pandas==2.0.3
+Pillow==10.2.0
+PyQt5==5.15.10
+PyQt5_sip==12.13.0
+Requests==2.31.0
+scikit_learn==1.3.2
+scipy==1.10.1
+selenium==4.17.2

AstroToolkit-1.3.2/src/AstroToolkit.egg-info/requires.txt

@@ -1,15 +0,0 @@
-astropy
-astroquery
-bokeh>=3.1.1
-cmasher
-importlib_resources
-matplotlib
-numba
-numpy
-pandas
-Pillow
-PyQt5
-PyQt5_sip
-Requests
-scikit_learn
-scipy