updates for new release

scottprahl · Jan 5, 2021 · 2a40f12 · 2a40f12
1 parent 96cf03f
commit 2a40f12
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 16 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,12 @@
 Changelog
 ==========
 
+v0.6.0 (1/5/2021)
+------------------
+   * improve help()
+   * improve sphinx docs
+   * new names
+
 v0.5.0 (5/25/2020)
 ------------------
    * sphinx docs

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -5,6 +5,7 @@ exclude .gitignore
 exclude Makefile
 exclude docs/*.ipynb
 exclude docs/index.rst
+exclude docs/ofiber.rst
 exclude docs/conf.py
 exclude release.txt
 exclude todo.rst
diff --git a/Makefile b/Makefile
@@ -39,12 +39,14 @@ lint:
 	-pep257 ofiber/graded_index.py
 	-pylint ofiber/noise.py
 	-pep257 ofiber/noise.py
-	-pylint ofiber/parabolic.py
-	-pep257 ofiber/parabolic.py
+	-pylint ofiber/planar_parabolic.py
+	-pep257 ofiber/planar_parabolic.py
 	-pylint ofiber/planar_step.py
 	-pep257 ofiber/planar_step.py
 	-pylint ofiber/refraction.py
 	-pep257 ofiber/refraction.py
+	-pylint ofiber/__init__.py
+	-pep257 ofiber/__init__.py
 
 rcheck:
 	make clean

diff --git a/docs/conf.py b/docs/conf.py
@@ -16,11 +16,11 @@
 # -- Project information -----------------------------------------------------
 
 project = 'ofiber'
-copyright = '2018-2020 Scott Prahl'
+copyright = '2018-2021 Scott Prahl'
 author = 'Scott Prahl'
 
 # The full version, including alpha/beta/rc tags
-release = '0.5.0'
+release = '0.6.0'
 
 master_doc = 'index'
 

diff --git a/ofiber/__init__.py b/ofiber/__init__.py
@@ -6,7 +6,7 @@
 Info about calculating simple optical fibers parameters::
 
     help(ofiber.basics)
-    
+
 Info about modes and other characteristics of cylindrical fibers::
 
     help(ofiber.cylinder_step)

diff --git a/ofiber/planar_step.py b/ofiber/planar_step.py
@@ -11,9 +11,9 @@
 planes of the waveguide.
 
 The top and bottom layers are semi-infinite with constant index of refraction.
-The middle layer has a fixed thickness and a fixed index of refraction. This 
+The middle layer has a fixed thickness and a fixed index of refraction. This
 waveguide is slightly simpler mathematically to solve than the cylindrical
-waveguide and serves as a useful preliminary model that exhibits general 
+waveguide and serves as a useful preliminary model that exhibits general
 behaviors found in most waveguides.
 
 The functions fall into two classes, those for transverse electric fields (TE)

diff --git a/pyproject.toml b/pyproject.toml
@@ -14,10 +14,4 @@ envlist = py37
 [testenv]
 
 commands =
-    wfmconvert E info {toxinidir}/wfm/DS1052E.wfm
-    wfmconvert Z info {toxinidir}/wfm/DS1054Z-A.wfm
-    wfmconvert 2 info {toxinidir}/wfm/DS2000-A.wfm
-    wfmconvert 4 info {toxinidir}/wfm/DS4024-A.wfm
-    wfmconvert E  csv {toxinidir}/wfm/DS1102E-A.wfm
-    wfmconvert E  wav {toxinidir}/wfm/DS1102E-A.wfm
 """
diff --git a/release.txt b/release.txt
@@ -4,9 +4,9 @@
   make rcheck
 
 # update the version in setup.py
-  git commit -m 'update version' setup.py
+  git commit -m 'update version' setup.cfg docs/conf.py
 
-# update CHANGELOG.txt  `git shortlog`
+# update CHANGELOG.txt  `git shortlog v0.5.0..HEAD`
   git commit -m 'update recent changes' CHANGELOG.txt
   git push
 

diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal=1
 
 [metadata]
 name=ofiber
-version=0.5.0
+version=0.6.0
 author=Scott Prahl
 author_email[email protected]
 description=Light Propagation in Optical Fibers