pyatomdb 1.0.2__tar.gz → 1.0.3__tar.gz

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/COPYING.txt

@@ -1,4 +1,4 @@
-Copyright 2015-20 Smithsonian Institution. Permission is granted to use, copy, 
+Copyright 2015-25 Smithsonian Institution. Permission is granted to use, copy, 
 modify, and distribute this software and its documentation for educational,
 research and non-profit purposes, without fee and without a signed
 licensing agreement, provided that this notice, including the following

{pyatomdb-1.0.2/pyatomdb.egg-info → pyatomdb-1.0.3}/PKG-INFO

@@ -1,13 +1,38 @@
 Metadata-Version: 2.1
 Name: pyatomdb
-Version: 1.0.2
+Version: 1.0.3
 Summary: AtomDB python library.
-Home-page: http://www.atomdb.org
-Author: Adam Foster
-Author-email: afoster@cfa.harvard.edu
-License: Smithsonian
+Author-email: Adam Foster <afoster@cfa.harvard.edu>
+Maintainer-email: Adam Foster <afoster@cfa.harvard.edu>
+License: Copyright 2015-25 Smithsonian Institution. Permission is granted to use, copy, 
+        modify, and distribute this software and its documentation for educational,
+        research and non-profit purposes, without fee and without a signed
+        licensing agreement, provided that this notice, including the following
+        two paragraphs, appear in all copies, modifications and distributions.
+        For commercial licensing, contact the Office of the Chief Information
+        Officer, Smithsonian Institution, 380 Herndon Parkway, MRC 1010, Herndon,
+        VA. 20170, 202-633-5256.
+        
+        This software and accompanying documentation is supplied "as is" without
+        warranty of any kind. The copyright holder and the Smithsonian
+        Institution: (1) expressly disclaim any warranties, express or implied,
+        including but not limited to any implied warranties of merchantability,
+        fitness for a particular purpose, title or non-infringement; (2) do not
+        assume any legal liability or responsibility for the accuracy,
+        completeness, or usefulness of the software; (3) do not represent that use
+        of the software would not infringe privately owned rights; (4) do not
+        warrant that the software is error-free or will be maintained, supported,
+        updated or enhanced; (5) will not be liable for any indirect, incidental,
+        consequential special or punitive damages of any kind or nature,
+        including but not limited to lost profits or loss of data, on any basis
+        arising from contract, tort or otherwise, even if any of the parties has
+        been warned of the possibility of such loss or damage.
+        
+Project-URL: Homepage, http://www.atomdb.org
+Project-URL: Documentation, https://atomdb.readthedocs.io/en/master/
+Project-URL: Repository, https://github.com/AtomDB/pyatomdb.git
+Project-URL: Issues, https://github.com/AtomDB/pyatomdb/issues
 Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: End Users/Desktop
@@ -16,7 +41,7 @@ Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: POSIX
-License-File: COPYING.txt
+Description-Content-Type: text/x-rst
 
 ========
 PYATOMDB
@@ -283,3 +308,7 @@ Updated to allow access to all AtomDB v3.1.x eigenvector files (path was hardcod
 1.0.2
 January 31st 2025
 Removed debug output erroneously added to spectrum.py calls.
+
+1.0.3
+March 7th 2025
+Repaired util.py check_version command, along with other bug fixes.

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/README.rst

@@ -263,3 +263,7 @@ Updated to allow access to all AtomDB v3.1.x eigenvector files (path was hardcod
 1.0.2
 January 31st 2025
 Removed debug output erroneously added to spectrum.py calls.
+
+1.0.3
+March 7th 2025
+Repaired util.py check_version command, along with other bug fixes.

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/README.txt

@@ -263,3 +263,7 @@ Updated to allow access to all AtomDB v3.1.x eigenvector files (path was hardcod
 1.0.2
 January 31st 2025
 Removed debug output erroneously added to spectrum.py calls.
+
+1.0.3
+March 7th 2025
+Repaired util.py check_version command, along with other bug fixes.

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/pyatomdb/__init__.py

@@ -9,7 +9,7 @@ from . import apec
 from . import util
 import sys, glob
 
-__version__="1.0.2"
+__version__="1.0.3"
 
 try:
   PATH = os.path.dirname(__file__)

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/pyatomdb/apec.py

@@ -5681,6 +5681,12 @@ def _solve_ionbal_eigen(Z, Te, init_pop=False, tau=False, \
   telist = numpy.logspace(4,9,1251)
   kTlist=telist*const.KBOLTZ
 
+  try:
+    dd = d['EIGEN']
+  except KeyError:
+    elsymb = atomic.Ztoelsymb(Z).lower()
+    dd=d[elsymb]
+
   # if we are looking for equilibrium, return the nearest data
   if cie:
 
@@ -5690,10 +5696,10 @@ def _solve_ionbal_eigen(Z, Te, init_pop=False, tau=False, \
     if Tdiff > 0.0:
       factorlow = (kTlist[ite[1]]-kT)/Tdiff
       factorhigh = (kT-kTlist[ite[0]])/Tdiff
-      equilib = factorlow * d['EIGEN'].data['FEQB'][ite[0]]+\
-                factorhigh * d['EIGEN'].data['FEQB'][ite[1]]
+      equilib = factorlow * dd.data['FEQB'][ite[0]]+\
+                factorhigh * dd.data['FEQB'][ite[1]]
     else:
-      equilib = d['EIGEN'].data['FEQB'][ite[0]]
+      equilib = dd.data['FEQB'][ite[0]]
 
     #renormalize
     equilib /= sum(equilib)
@@ -5715,16 +5721,16 @@ def _solve_ionbal_eigen(Z, Te, init_pop=False, tau=False, \
     if Z==1:
       for i in range(Z):
         for j in range(Z):
-          lefteigenvec[i,j] = d['EIGEN'].data['VL'][kTindex]
-          righteigenvec[i,j] = d['EIGEN'].data['VR'][kTindex]
+          lefteigenvec[i,j] = dd.data['VL'][kTindex]
+          righteigenvec[i,j] = dd.data['VR'][kTindex]
     else:
       for i in range(Z):
         for j in range(Z):
-          lefteigenvec[i,j] = d['EIGEN'].data['VL'][kTindex][i*Z+j]
-          righteigenvec[i,j] = d['EIGEN'].data['VR'][kTindex][i*Z+j]
+          lefteigenvec[i,j] = dd.data['VL'][kTindex][i*Z+j]
+          righteigenvec[i,j] = dd.data['VR'][kTindex][i*Z+j]
 
 
-    work = numpy.array(init_pop_calc[1:] - d['EIGEN'].data['FEQB'][kTindex][1:], dtype=float)
+    work = numpy.array(init_pop_calc[1:] - dd.data['FEQB'][kTindex][1:], dtype=float)
 
     fspectmp = numpy.matrix(lefteigenvec) * numpy.matrix(work).transpose()
 
@@ -5735,16 +5741,16 @@ def _solve_ionbal_eigen(Z, Te, init_pop=False, tau=False, \
     for itau, ttau in enumerate(tau_vec):
       if Z >1:
         for i in range(Z):
-          worktmp[i] = fspectmp[i]*numpy.exp(d['EIGEN'].data['EIG'][kTindex,i]*delt*ttau)
+          worktmp[i] = fspectmp[i]*numpy.exp(dd.data['EIG'][kTindex,i]*delt*ttau)
 
       else:
-        worktmp[0] = fspectmp[0]*numpy.exp(d['EIGEN'].data['EIG'][kTindex]*delt*ttau)
+        worktmp[0] = fspectmp[0]*numpy.exp(dd.data['EIG'][kTindex]*delt*ttau)
 
       frac = numpy.zeros(Z+1)
       for i in range(Z):
         for j in range(Z):
           frac[i+1] += worktmp[j]*righteigenvec[j][i]
-        frac[i+1] += d['EIGEN'].data['FEQB'][kTindex][i+1]
+        frac[i+1] += dd.data['FEQB'][kTindex][i+1]
 
       if debug:
         frac_out[ikT, itau,:] = frac

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/pyatomdb/atomdb.py

@@ -5776,22 +5776,31 @@ def _lorentz_power(version):
 
   f.write("%s\n"%(s))
 
-  ses = spectrum.Session(elements=Zlist)
-  ses.set_specbins(ebins, specunits='keV')
+  ses = spectrum.CIESession(elements=Zlist)
+  ses.set_response(ebins, raw=True)
   for iT in range(51):
     kT = 4.0+(iT*0.1)
     kT = 10**kT
     if iT == 0:
       kT+=1
-    ses.return_spectra(kT, teunit='K', nearest=True)
+    ses.return_spectrum(kT, teunit='K', nearest=True)
     print(iT)
 
+  ses.set_eebrems(False)
   for Z in Zlist:
     tot_e = numpy.zeros(51)
     s = "%2i"%(Z)
     print(Z)
     for iT in range(2,53):
-      spec = ses.spectra[iT].spectrum_by_Z[Z]
+      kT = 4.0+((iT-2)*0.1)
+      kT = 10**kT
+      if iT == 0:
+        kT+=1
+
+      ses.set_abund(Zlist, 0.0)
+      ses.set_abund(Z, 1.0)
+
+      spec = ses.return_spectrum(kT, teunit='K',nearest=True)
       e = spec*energy
       # add corrections for NH != 1, to 1m3 volume, and abundance set
       # from AG89 to Lodders 2009
@@ -5926,7 +5935,7 @@ def _lorentz_neicsd(version):
   f.write('Z Ion Pop\n')
   for Z in [1,2,6,7,8,10,12,14,16,18,20,26,28]:
     print(Z)
-    ionbal = apec.solve_ionbal_eigen(Z, Te_final,  tau=tau, Te_init=Te_init, \
+    ionbal = apec._solve_ionbal_eigen(Z, Te_final,  tau=tau, init_pop=Te_init, \
                          teunit='K')
 
     for i in range(len(ionbal)):
@@ -6014,7 +6023,7 @@ def _lorentz_neilines(version):
 
     for Z in [1,2,6,7,8,10,12,14,16,18,20,26,28]:
 
-      ionbal[Z] = apec.solve_ionbal_eigen(Z, Te_final,  tau=tau, Te_init=Te_init, \
+      ionbal[Z] = apec._solve_ionbal_eigen(Z, Te_final,  tau=tau, init_pop=Te_init, \
                            teunit='K')
 
     ionbal_square = numpy.zeros([31,31])
@@ -6178,45 +6187,56 @@ def _lorentz_neicont(version):
   now = datetime.datetime.now()
   util.switch_version(version)
 
-  # make the spectrum.
-  speclo = numpy.zeros(len(ebins)-1)
-  specup = numpy.zeros(len(ebins)-1)
-  ag89 = get_abundance(abundset='AG89')
-  lodd = get_abundance(abundset='Lodd09')
-  ldat = pyfits.open(os.path.expandvars("$ATOMDB/apec_nei_line.fits"))
-  cdat = pyfits.open(os.path.expandvars("$ATOMDB/apec_nei_comp.fits"))
-
 
-  upind = numpy.where(ldat[1].data['kT']>Te_final*const.KBOLTZ)[0][0]+2
-  loind = upind-1
 
-  for Z in range(1,31):
-    print("starting element %s"%(atomic.Ztoelname(Z)))
-    ionbal = apec.solve_ionbal_eigen(Z, Te_final,  tau=tau, Te_init=Te_init, \
-                           teunit='K')
-
-    abund = lodd[Z]/ag89[Z]
-    for z in range(len(ionbal)):
-      z1 = z+1
-      if ionbal[z] > 1e-10:
-        tmp = spectrum.make_ion_spectrum(ebins, loind, Z, z1, linefile=ldat,\
-                                         cocofile=cdat)
-        speclo+=tmp*ionbal[z]*abund
-
-        tmp = spectrum.make_ion_spectrum(ebins, upind, Z, z1, linefile=ldat,\
-                                         cocofile=cdat)
-        specup+=tmp*ionbal[z]*abund
-
-  # now interpolate
-  t1 = numpy.log(ldat[1].data['kT'][loind-2])
-  t2 = numpy.log(ldat[1].data['kT'][upind-2])
-  print("t1 = ", t1)
-  print("t2 = ", t2)
-  print("log(tefinal)", numpy.log(Te_final*const.KBOLTZ))
-  r1 = 1- (numpy.log(Te_final*const.KBOLTZ)-t1)/(t2-t1)
-  r2 = 1- r1
-  print("r1= ",r1, "r2  ", r2)
-  spec = speclo*r1+specup*r2
+  # make the spectrum.
+  neispec = spectrum.NEISession()
+  neispec.set_abundset('Lodd09')
+  #neispec.set_abund('Lodd09')
+
+  neispec.set_response(ebins, raw=True)
+  spec=neispec.return_spectrum(Te_init, tau, init_pop=Te_init, teunit='K')
+
+  # speclo = numpy.zeros(len(ebins)-1)
+  # specup = numpy.zeros(len(ebins)-1)
+  # ag89 = get_abundance(abundset='AG89')
+  # lodd = get_abundance(abundset='Lodd09')
+  # ldat = pyfits.open(os.path.expandvars("$ATOMDB/apec_nei_line.fits"))
+  # cdat = pyfits.open(os.path.expandvars("$ATOMDB/apec_nei_comp.fits"))
+
+
+  # upind = numpy.where(ldat[1].data['kT']>Te_final*const.KBOLTZ)[0][0]+2
+  # loind = upind-1
+
+
+
+  # for Z in range(1,31):
+    # print("starting element %s"%(atomic.Ztoelname(Z)))
+    # ionbal = apec._solve_ionbal_eigen(Z, Te_final,  tau=tau, init_pop=Te_init, \
+                           # teunit='K')
+
+    # abund = lodd[Z]/ag89[Z]
+    # for z in range(len(ionbal)):
+      # z1 = z+1
+      # if ionbal[z] > 1e-10:
+        # tmp = spectrum.make_ion_spectrum(ebins, loind, Z, z1, linefile=ldat,\
+                                         # cocofile=cdat)
+        # speclo+=tmp*ionbal[z]*abund
+
+        # tmp = spectrum.make_ion_spectrum(ebins, upind, Z, z1, linefile=ldat,\
+                                         # cocofile=cdat)
+        # specup+=tmp*ionbal[z]*abund
+
+  # # now interpolate
+  # t1 = numpy.log(ldat[1].data['kT'][loind-2])
+  # t2 = numpy.log(ldat[1].data['kT'][upind-2])
+  # print("t1 = ", t1)
+  # print("t2 = ", t2)
+  # print("log(tefinal)", numpy.log(Te_final*const.KBOLTZ))
+  # r1 = 1- (numpy.log(Te_final*const.KBOLTZ)-t1)/(t2-t1)
+  # r2 = 1- r1
+  # print("r1= ",r1, "r2  ", r2)
+  # spec = speclo*r1+specup*r2
 
   # now scale spectrum by NH to get correct norm, and 1e6 to get to 1m^3
   spec *= 0.8365*1e6
@@ -6244,7 +6264,7 @@ def __get_lorentz_levpop(Z,z1,up,lo, Te, Ne, version, linelabel):
   # first, get the ionization balance
   datacache={}
   lvdat = get_data(Z,z1,'LV', datacache=datacache)
-  ionbal = apec.solve_ionbal_eigen(Z,Te, datacache=datacache)
+  ionbal = apec._solve_ionbal_eigen(Z,Te, datacache=datacache)
   settings = apec.parse_par_file(os.path.expandvars('$ATOMDB/apec_v%s.par'%\
                                 (version)))
 

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/pyatomdb/spectrum.py

@@ -2849,7 +2849,7 @@ class CIESession():
     Returns
     -------
     emiss_aeff : array(float)
-      Emissivity \* Aeff
+      Emissivity * Aeff
     """
 
 
@@ -6327,6 +6327,10 @@ class NEISession(CIESession):
 
 
     self.spectra.ebins = self.specbins
+    self.spectra.dopseudo = self.dopseudo
+    self.spectra.dolines = self.dolines
+    self.spectra.docont = self.docont
+
     self.spectra.ebins_checksum=hashlib.md5(self.spectra.ebins).hexdigest()
     s= self.spectra.return_spectrum(Te, tau, init_pop=init_pop, \
                                     teunit=teunit, \
@@ -6653,7 +6657,10 @@ class _NEISpectrum(_CIESpectrum):
                                   thermal_broadening = self.thermal_broadening,\
                                   broaden_limit = epslimit,\
                                   velocity_broadening = self.velocity_broadening,\
-                                  broaden_object=broaden_object) *\
+                                  broaden_object=broaden_object,\
+                                  dopseudo=self.dopseudo,\
+                                  docont=self.docont,\
+                                  dolines=self.dolines) *\
                                   ionfrac[z1-1]
 
 

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/pyatomdb/util.py

@@ -637,7 +637,7 @@ def check_version():
   """
   import curl
   try:
-    adbroot_init = os.environ['ATOMDB']
+    adbroot = os.environ['ATOMDB']
   except KeyError:
     print("You must set the ATOMDB environment variable for this to work!")
     raise
@@ -647,6 +647,9 @@ def check_version():
 
   a.close()
 
+  userprefs = load_user_prefs()
+  userid = userprefs['USERID']
+
   curversion = open(os.path.expandvars('$ATOMDB/VERSION'),'r').read()[:-1]
   if (curversion != newversion):
     ans = question("New version %s is available. Upgrade?"%(newversion),"y",["y","n"])
@@ -656,20 +659,21 @@ def check_version():
         "Do you wish to download the emissivity data for these files (recommended)?",\
         "y",multichoice=["y","n"])
 
+
+
       if get_new_files=='y':
-        download_atomdb_emissivity_files(adbroot, userid, version)
+        download_atomdb_emissivity_files(adbroot, userid, newversion)
 
       get_new_nei_files=question(\
         "Do you wish to download the non-equilibrium emissivity data for these files (recommended)?",\
         "y",multichoice=["y","n"])
 
       if get_new_nei_files=='y':
-        download_atomdb_nei_emissivity_files(adbroot, userid, version)
+        download_atomdb_nei_emissivity_files(adbroot, userid, newversion)
   else:
     print("Current version %s is up to date" %(curversion))
 
   # now update the time the last version check happened.
-  userprefs = load_user_prefs()
   userprefs['LASTVERSIONCHECK'] = time.time()
   write_user_prefs(userprefs)
 
@@ -711,7 +715,7 @@ def switch_version(version, force=False):
 
   # check the AtomDB version string is a suitable string
 
-  if not re.match('^\d\.\d\.\d$',version):
+  if not re.match(r"^\d*\.\d*\.\d*$",version):
     print("Error: version number must be of format %i.%i.%i, e.g. 3.0.2")
     return
 
@@ -2309,7 +2313,7 @@ def make_release_filetree(filemapfile_in, filemapfile_out, \
     for key in ['em','ci','pi','la','ai','ir','ec','lv','pc','dr']:
       if fmap[key][i] =='': continue
 
-      if  re.search("_\d.fits",fmap[key][i]):
+      if  re.search(r"_\d.fits",fmap[key][i]):
 
         fin = fmap[key][i]
         fmapf = re.sub(replace_source, 'XXX', fin)
@@ -2548,6 +2552,8 @@ def make_linelist(linefile, outfile):
   hdu0.header['HDUCLASS']= ("EMISSIVITY","Line Emission Output")
   hdu0.header['HDUCLAS1']= ("SHORT_LINE","Line Emission Output")
   hdu0.header['HDUVERS']= ("1.0.0","Version of datafile")
+  hdu0.header['SIONBAL']= d[0].header.cards['SIONBAL']
+  hdu0.header['SEIGEN']= d[0].header.cards['SEIGEN']
 
 
   #secondary HDU, hdu1:

{pyatomdb-1.0.2 → pyatomdb-1.0.3/pyatomdb.egg-info}/PKG-INFO

@@ -1,13 +1,38 @@
 Metadata-Version: 2.1
 Name: pyatomdb
-Version: 1.0.2
+Version: 1.0.3
 Summary: AtomDB python library.
-Home-page: http://www.atomdb.org
-Author: Adam Foster
-Author-email: afoster@cfa.harvard.edu
-License: Smithsonian
+Author-email: Adam Foster <afoster@cfa.harvard.edu>
+Maintainer-email: Adam Foster <afoster@cfa.harvard.edu>
+License: Copyright 2015-25 Smithsonian Institution. Permission is granted to use, copy, 
+        modify, and distribute this software and its documentation for educational,
+        research and non-profit purposes, without fee and without a signed
+        licensing agreement, provided that this notice, including the following
+        two paragraphs, appear in all copies, modifications and distributions.
+        For commercial licensing, contact the Office of the Chief Information
+        Officer, Smithsonian Institution, 380 Herndon Parkway, MRC 1010, Herndon,
+        VA. 20170, 202-633-5256.
+        
+        This software and accompanying documentation is supplied "as is" without
+        warranty of any kind. The copyright holder and the Smithsonian
+        Institution: (1) expressly disclaim any warranties, express or implied,
+        including but not limited to any implied warranties of merchantability,
+        fitness for a particular purpose, title or non-infringement; (2) do not
+        assume any legal liability or responsibility for the accuracy,
+        completeness, or usefulness of the software; (3) do not represent that use
+        of the software would not infringe privately owned rights; (4) do not
+        warrant that the software is error-free or will be maintained, supported,
+        updated or enhanced; (5) will not be liable for any indirect, incidental,
+        consequential special or punitive damages of any kind or nature,
+        including but not limited to lost profits or loss of data, on any basis
+        arising from contract, tort or otherwise, even if any of the parties has
+        been warned of the possibility of such loss or damage.
+        
+Project-URL: Homepage, http://www.atomdb.org
+Project-URL: Documentation, https://atomdb.readthedocs.io/en/master/
+Project-URL: Repository, https://github.com/AtomDB/pyatomdb.git
+Project-URL: Issues, https://github.com/AtomDB/pyatomdb/issues
 Classifier: Development Status :: 4 - Beta
-Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: Education
 Classifier: Intended Audience :: End Users/Desktop
@@ -16,7 +41,7 @@ Classifier: Topic :: Scientific/Engineering :: Astronomy
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: POSIX
-License-File: COPYING.txt
+Description-Content-Type: text/x-rst
 
 ========
 PYATOMDB
@@ -283,3 +308,7 @@ Updated to allow access to all AtomDB v3.1.x eigenvector files (path was hardcod
 1.0.2
 January 31st 2025
 Removed debug output erroneously added to spectrum.py calls.
+
+1.0.3
+March 7th 2025
+Repaired util.py check_version command, along with other bug fixes.

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/pyatomdb.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README.rst
 README.txt
 linear_approx.c
 make_test_outputs.py
+pyproject.toml
 setup.py
 docs/Makefile
 docs/apec.rst
@@ -89,7 +90,6 @@ pyatomdb/util.py
 pyatomdb.egg-info/PKG-INFO
 pyatomdb.egg-info/SOURCES.txt
 pyatomdb.egg-info/dependency_links.txt
-pyatomdb.egg-info/not-zip-safe
 pyatomdb.egg-info/requires.txt
 pyatomdb.egg-info/top_level.txt
 tests/__init__.py

pyatomdb-1.0.3/pyproject.toml

@@ -0,0 +1,40 @@
+[build-system]
+requires = ["setuptools >= 64"]
+build-backend = "setuptools.build_meta"
+
+[project]
+dynamic = ["version"]
+name = 'pyatomdb'
+dependencies = ["numpydoc", "requests", "wget", "numpy>=1.9.0", "scipy>=1.9.0", "joblib", "mock", "astropy", "pycurl"]
+authors = [
+  {name = "Adam Foster", email = "afoster@cfa.harvard.edu"}
+]
+maintainers = [
+  {name = "Adam Foster", email = "afoster@cfa.harvard.edu"}
+]
+description="AtomDB python library."
+#url=['http://www.atomdb.org']
+#packages=['pyatomdb','tests']
+
+classifiers=["Development Status :: 4 - Beta",
+#	     "Environment :: Console",
+	     "Intended Audience :: Developers",
+	     "Intended Audience :: Education",
+	     "Intended Audience :: End Users/Desktop",
+	     "Intended Audience :: Science/Research",
+	     "Topic :: Scientific/Engineering :: Astronomy",
+	     "Topic :: Scientific/Engineering :: Physics",
+	     "Programming Language :: Python :: 3",
+	     "Operating System :: POSIX"]
+ 
+readme = "README.rst"
+license = {file = "COPYING.txt"}
+[project.urls]
+Homepage = "http://www.atomdb.org"
+Documentation = "https://atomdb.readthedocs.io/en/master/"
+Repository = "https://github.com/AtomDB/pyatomdb.git"
+Issues = "https://github.com/AtomDB/pyatomdb/issues"
+#Changelog = "https://github.com/me/spam/blob/master/CHANGELOG.md"
+
+[tool.setuptools.dynamic]
+version = {attr = "pyatomdb.__version__"}

{pyatomdb-1.0.2 → pyatomdb-1.0.3}/setup.py

@@ -49,36 +49,37 @@ if on_rtd:
 
 else:
   extmos= [linapprox]
-
+#setup()
 setup(name='pyatomdb',
-      version=get_version('pyatomdb/__init__.py'),
-      description='AtomDB python library.',
-      url='http://www.atomdb.org',
-      author='Adam Foster',
-      author_email='afoster@cfa.harvard.edu',
-      license='Smithsonian',
+#      version=get_version('pyatomdb/__init__.py'),
+#      description='AtomDB python library.',
+#      url='http://www.atomdb.org',
+#      author='Adam Foster',
+#      author_email='afoster@cfa.harvard.edu',
+#      license='Smithsonian',
       packages=['pyatomdb','tests'],
-      classifiers=['Development Status :: 4 - Beta',\
-                   'Environment :: Console',\
-                   'Intended Audience :: Developers',\
-                   'Intended Audience :: Education',\
-                   'Intended Audience :: End Users/Desktop',\
-                   'Intended Audience :: Science/Research',\
-                   'Topic :: Scientific/Engineering :: Astronomy',\
-                   'Topic :: Scientific/Engineering :: Physics',\
-                   'Programming Language :: Python :: 3',\
-                   'Operating System :: POSIX'],
-      zip_safe=False,
-      long_description = README_TEXT,\
-      install_requires=[
-      "numpydoc",\
-      "requests",\
-      "wget",\
-      "numpy>=1.9.0",\
-      "scipy>=1.9.0",\
-      "joblib",\
-      "mock",\
-      "astropy",\
-      "pycurl"],
+#      classifiers=['Development Status :: 4 - Beta',\
+#                   'Environment :: Console',\
+#                   'Intended Audience :: Developers',\
+#                   'Intended Audience :: Education',\
+#                   'Intended Audience :: End Users/Desktop',\
+#                   'Intended Audience :: Science/Research',\
+#                   'Topic :: Scientific/Engineering :: Astronomy',\
+#                   'Topic :: Scientific/Engineering :: Physics',\
+#                   'Programming Language :: Python :: 3',\
+#                   'Operating System :: POSIX'],
+#      zip_safe=False,
+#      long_description = README_TEXT,\
+#      install_requires=[
+#      "numpydoc",\
+#      "requests",\
+#      "wget",\
+#      "numpy>=1.9.0",\
+#      "scipy>=1.9.0",\
+#      "joblib",\
+#      "mock",\
+#      "astropy",\
+#      "pycurl"],
       ext_modules = extmos)
-
+#
+#

pyatomdb-1.0.2/pyatomdb.egg-info/not-zip-safe

@@ -1 +0,0 @@
-