Skip to content

Commit

Permalink
fix version import
Browse files Browse the repository at this point in the history
  • Loading branch information
Jared Dean committed Mar 24, 2021
1 parent 4f850a8 commit aa7b0b0
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 18 deletions.
3 changes: 2 additions & 1 deletion __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

def isnotebook():
try:
shell = get_ipython().__class__.__name__
Expand All @@ -27,4 +28,4 @@ def isnotebook():

if isnotebook():
from sas_kernel.magics.log_magic import logMagic
get_ipython().register_magics(logMagic)
get_ipython().register_magics(logMagic)
14 changes: 7 additions & 7 deletions binder/postBuild
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ mkdir -p ~/.config/saspy/
cp ./binder/sascfg_personal.py ~/.config/saspy/

#set -ex
jupyter kernelspec list
jupyter nbextension list
# jupyter kernelspec list
# jupyter nbextension list


jupyter nbextension install --py sas_kernel.showSASLog --user
jupyter nbextension enable sas_kernel.showSASLog --py
# jupyter nbextension install --py sas_kernel.showSASLog --user
# jupyter nbextension enable sas_kernel.showSASLog --py

jupyter nbextension install --py sas_kernel.theme --user
jupyter nbextension enable sas_kernel.theme --py
# jupyter nbextension install --py sas_kernel.theme --user
# jupyter nbextension enable sas_kernel.theme --py

jupyter nbextension list
# jupyter nbextension list
1 change: 1 addition & 0 deletions sas_kernel/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@


"""SAS Kernel Juypter Implementation"""
from .version import __version__
3 changes: 1 addition & 2 deletions sas_kernel/showSASLog/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

from sas_kernel import __version__
# from .sas_kernel import __version__

def _jupyter_nbextension_paths():
return [dict(section="notebook",
Expand Down
4 changes: 2 additions & 2 deletions sas_kernel/theme/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
"""SAS Kernel Juypter Implementation"""

from sas_kernel import __version__
# from .sas_kernel import __version__

def _jupyter_nbextension_paths():
return [dict(section="notebook", src="", dest="theme", require="theme/theme_selector")]
return [dict(section="notebook", src="", dest="theme", require="theme/theme_selector")]
File renamed without changes.
16 changes: 10 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#

exec(open('./sas_kernel/version.py').read())
print("Installing sas_kernel version:{}".format(__version__))
try:
from setuptools import setup, find_packages
except ImportError:
from distutils.core import setup, find_packages
from distutils.command.install import install

import os
import sys
from sas_kernel._version import __version__
import os, sys

# from sas_kernel._version import __version__

SVEM_FLAG = '--single-version-externally-managed'
if SVEM_FLAG in sys.argv:
Expand Down Expand Up @@ -58,9 +61,10 @@ def run(self):
"jupyter_client>=6", "IPython>=7.12.0"],
setup_requires=["jupyter_client>=6", "IPython>=7.12.0"],
extras_require={'jlab_ext': ['jupyterlab >=3 ',
'jlab_create_sas_file',
'sas2nb',
'sas_log_viewer_v2']},
# 'sas2nb',
# 'sas_log_viewer_v2',
'jlab_create_sas_file'
]},
classifiers=['Framework :: IPython',
'License :: OSI Approved :: Apache Software License',
'Programming Language :: Python :: 3',
Expand Down

0 comments on commit aa7b0b0

Please sign in to comment.