SLiCAP 3.3.1__tar.gz → 3.4__tar.gz

{slicap-3.3.1 → slicap-3.4}/MANIFEST.in

@@ -1,2 +1,2 @@
-recursive-include SLiCAP/docs *
+recursive-include SLiCAP/docs/ *
 recursive-include SLiCAP/files/ *

{slicap-3.3.1 → slicap-3.4}/PKG-INFO

@@ -1,9 +1,7 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: SLiCAP
-Version: 3.3.1
+Version: 3.4
 Summary: SLiCAP: more than SYMBOLIC SPICE
-Home-page: https://github.com/SLiCAP/SLiCAP_python/
-Author: Anton Montagne
 Author-email: Anton Montagne <anton@montagne.nl>
 License: MIT
 Project-URL: Homepage, https://slicap.github.io/SLiCAP_python/
@@ -12,22 +10,20 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: docutils>=0.18
+License-File: LICENCE.txt
 Requires-Dist: numpy>=1.26
 Requires-Dist: sympy>=1.12
 Requires-Dist: scipy>=1.12
 Requires-Dist: ply>=3.11
 Requires-Dist: matplotlib>=3.8.0
-Requires-Dist: sphinx-rtd-theme>=1.2.0
 Requires-Dist: svgelements>=1.9.6
 Requires-Dist: cairosvg>=2.7.1
 Requires-Dist: IPython>=8.19
 Requires-Dist: windows_tools>=2.4; sys_platform == "win32"
 Requires-Dist: pywin32>306; sys_platform == "win32"
-Dynamic: author
-Dynamic: home-page
-Dynamic: license
-Dynamic: requires-python
+Requires-Dist: docutils>=0.18
+Requires-Dist: sphinx-rtd-theme>=1.2.0
+Dynamic: license-file
 
 # SLiCAP: more than SYMBOLIC SPICE
 
@@ -65,16 +61,11 @@ Dynamic: requires-python
 - Symbolic and numeric DC and DC variance analysis for determination of budgets for resistor tolerances, offset, temperature effects, matching and tracking
 - Symbolic and numeric derivation and solution of design equations for bandwidh, frequency response, noise, dc variance, and temperature stability
 
-## Setting up SLiCAP
-1. Intall Python 3.12+ with the packages listed in requirements.txt (for MSwindows Anaconda installation is preferred)
-2. Download or clone the SLiCAP archive from github
-3. Extract it in some directory
-4. Open a terminal (or an Anaconda terminal if you run python from Anaconda) in the directory with setup.py
-5. Enter: 
+## Installing SLiCAP from pypi
 
-       python -m pip install .
-   
-   Don't forget the dot!
+1. Enter: 
+
+       pip install slicap
 
 ## Addidional software
 - SLiCAP can generate netlists from schematic files from:
@@ -100,7 +91,6 @@ On the first run:
   - NGspice
   - gSchem (MSWindows only)
   - lepton-eda (Linux and MacOS)
-  - Inkscape
 - SLiCAP creates a SLiCAP.ini file in the SLiCAP home directory. This file contains initial setting and commands to start the above applications. It can be edited manually, and when deleted it will be recreated on the next run. Searching for applications on MSWindows may take a while!
 
 On the first run of a project, SLiCAP creates a SLiCAP.ini file in the project folder, each time you run the project this file is updated. If you delete it it will be recreated on the next run.
@@ -121,6 +111,27 @@ Execution of the SLiCAP command:
     
 shows the HTML documentation in your default browser.
 
+## Setting up SLiCAP from source code
+1. Intall Python 3.12+ with the packages listed in requirements.txt (for MSwindows Anaconda installation is preferred)
+2. Download or clone the SLiCAP archive from github
+3. Extract it in some directory
+4. Open a terminal (or an Anaconda terminal if you run python from Anaconda) in the directory with setup.py
+5. Install requirements:
+
+       python -m pip install -r requirements.txt
+
+6. Make Documentation:
+
+       cd ./doc
+       make html
+       cd ..
+
+7. Lastly, Install: 
+
+       python -m pip install .
+   
+   Don't forget the dot!
+
 ## Contributing
 If you want to contribute to the development of SLiCAP, please [Email Us](mailto:anton@montagne.nl).
 

{slicap-3.3.1 → slicap-3.4}/README.md

@@ -34,16 +34,11 @@
 - Symbolic and numeric DC and DC variance analysis for determination of budgets for resistor tolerances, offset, temperature effects, matching and tracking
 - Symbolic and numeric derivation and solution of design equations for bandwidh, frequency response, noise, dc variance, and temperature stability
 
-## Setting up SLiCAP
-1. Intall Python 3.12+ with the packages listed in requirements.txt (for MSwindows Anaconda installation is preferred)
-2. Download or clone the SLiCAP archive from github
-3. Extract it in some directory
-4. Open a terminal (or an Anaconda terminal if you run python from Anaconda) in the directory with setup.py
-5. Enter: 
+## Installing SLiCAP from pypi
 
-       python -m pip install .
-   
-   Don't forget the dot!
+1. Enter: 
+
+       pip install slicap
 
 ## Addidional software
 - SLiCAP can generate netlists from schematic files from:
@@ -69,7 +64,6 @@ On the first run:
   - NGspice
   - gSchem (MSWindows only)
   - lepton-eda (Linux and MacOS)
-  - Inkscape
 - SLiCAP creates a SLiCAP.ini file in the SLiCAP home directory. This file contains initial setting and commands to start the above applications. It can be edited manually, and when deleted it will be recreated on the next run. Searching for applications on MSWindows may take a while!
 
 On the first run of a project, SLiCAP creates a SLiCAP.ini file in the project folder, each time you run the project this file is updated. If you delete it it will be recreated on the next run.
@@ -90,6 +84,27 @@ Execution of the SLiCAP command:
     
 shows the HTML documentation in your default browser.
 
+## Setting up SLiCAP from source code
+1. Intall Python 3.12+ with the packages listed in requirements.txt (for MSwindows Anaconda installation is preferred)
+2. Download or clone the SLiCAP archive from github
+3. Extract it in some directory
+4. Open a terminal (or an Anaconda terminal if you run python from Anaconda) in the directory with setup.py
+5. Install requirements:
+
+       python -m pip install -r requirements.txt
+
+6. Make Documentation:
+
+       cd ./doc
+       make html
+       cd ..
+
+7. Lastly, Install: 
+
+       python -m pip install .
+   
+   Don't forget the dot!
+
 ## Contributing
 If you want to contribute to the development of SLiCAP, please [Email Us](mailto:anton@montagne.nl).
 

{slicap-3.3.1 → slicap-3.4}/SLiCAP/SLiCAPconfigure.py

@@ -19,13 +19,14 @@ from os.path import expanduser
 from datetime import datetime
 from sympy import Symbol
 from time import time
-    
+from SLiCAP.__init__ import __version__ as INSTALLVERSION
+
 if platform.system() == 'Windows':
     import win32api
     import windows_tools.installed_software as wi
 
 TIMEOUT = 120
-INSTALLVERSION = "3.2.4"
+#INSTALLVERSION = "3.3.2"
 
 def _check_version():
     """

{slicap-3.3.1 → slicap-3.4}/SLiCAP/SLiCAPhtml.py

@@ -113,7 +113,7 @@ def _HTMLfoot(indexFile):
     idx = ini.html_index.split('.')[0]
     html = '\n<div id="footnote">\n'
     html += '<p>Go to <a href="' +  ini.html_index + '">' + idx + '</a></p>\n'
-    html += '<p>SLiCAP: Symbolic Linear Circuit Analysis Program, Version 3.2 &copy 2009-2025 SLiCAP development team</p>\n'
+    html += '<p>SLiCAP: Symbolic Linear Circuit Analysis Program, Version %s &copy 2009-2025 SLiCAP development team</p>\n'%(ini.INSTALLVERSION)
     html += '<p>For documentation, examples, support, updates and courses please visit: <a href="https://analog-electronics.tudelft.nl">analog-electronics.tudelft.nl</a></p>\n'
     html += '<p>Last project update: %s</p>\n'%(ini.last_updated)
     html += '</div></body></html>'

{slicap-3.3.1 → slicap-3.4}/SLiCAP/SLiCAPkicad.py

@@ -70,14 +70,15 @@ def _parseKiCADnetlistlines(lines, cirTitle):
                 title = _checkTitle(" ".join(fields[1:]))
         elif fields[0] == "comp":
             newComp = _KiCADcomponent()
-            newComp.refDes = fields[-1][1:-1]
+            newComp.refDes = fields[fields.index('ref')+1][1:-1]
             comps= True
         elif fields[0] == "tstamps":
             components[newComp.refDes] = newComp
             comps = False
         elif fields[0] == "value" and comps:
-            if fields[-1][1:-1] != '~':
-                newComp.params["value"] = fields[-1][1:-1]
+            value = fields[fields.index("value")+1][1:-1]
+            if value != '~':
+                newComp.params["value"] = value
         elif fields[0] == "field" and comps:
             try:
                 fieldName = fields[2][1:-1]
@@ -94,11 +95,12 @@ def _parseKiCADnetlistlines(lines, cirTitle):
                 # Field has no value!
                 pass
         elif fields[0] == 'net':
-            lastNode = fields[-1][1:-1]
+            lastNode = fields[fields.index('name')+1][1:-1]
+            #lastNode = fields[4][1:-1]
             nodes[lastNode] = lastNode
         elif fields[0] == "node":
-            refDes = fields[2][1:-1]
-            pinNum = fields[4][1:-1]
+            refDes = fields[fields.index('ref')+1][1:-1]
+            pinNum = fields[fields.index("pin")+1][1:-1]
             components[refDes].nodes[pinNum] = lastNode
     nodenames = nodes.keys()
     for node in nodenames:

{slicap-3.3.1 → slicap-3.4}/SLiCAP/__init__.py

@@ -4,4 +4,4 @@ Spyder Editor
 
 """
 from .SLiCAP import *
-__version__ = "3.3.01"
+__version__ = "3.4"