Skip to content

Commit c187ae4

Browse files
authored
fix data package issue for pypi; remove old readme. (#78)
* add sas2nb for binder and SO question * bump version 2.4.4 after merge * add iris.sas test file * change github workflow to not upload wheel. * workaround binder wheel install issue. * fix data packaging for pypi * bump version
1 parent 66541c2 commit c187ae4

File tree

5 files changed

+17
-195
lines changed

5 files changed

+17
-195
lines changed

README.rst

-91
This file was deleted.

sas_kernel/Readme.md

-85
This file was deleted.

sas_kernel/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = '2.4.7'
16+
__version__ = '2.4.9'

setup.cfg

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[metadata]
22
description = A SAS kernel for Jupyter
3-
# description_file = file: README.md
4-
long_description = README.md
3+
long_description = file: Readme.md
4+
long_description_content_type = text/markdown
55
author = Jared Dean
66
license = Apache Software License
7-
license_file = LICENSE.txt
7+
license_files = LICENSE.txt
88
author_email =jared.dean@sas.com
99
url = https://github.com/sassoftware/sas_kernel
1010

@@ -17,6 +17,7 @@ classifiers =
1717
Programming Language :: Python :: 3.6
1818
Programming Language :: Python :: 3.7
1919
Programming Language :: Python :: 3.8
20+
Programming Language :: Python :: 3.9
2021
Intended Audience :: Science/Research
2122
Intended Audience :: Developers
2223
Operating System :: OS Independent
@@ -35,12 +36,9 @@ setup_requires =
3536
jupyter_client >= 6
3637
ipython >= 7
3738

38-
# include_package_data = True
39-
4039
[options.extras_require]
4140
jlab_ext =
4241
jupyterlab >=3
4342
jlab_create_sas_file
43+
sas2nb
4444
# sas_log_viewer_v2
45-
# sas2nb
46-

setup.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,19 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
17+
try:
18+
from setuptools import setup, find_packages
19+
except ImportError:
20+
from distutils.core import setup, find_packages
1821
from distutils.command.install import install
19-
import sys
20-
import os
21-
from setuptools import setup, find_packages
22-
exec(open('./sas_kernel/version.py').read())
23-
print("Installing sas_kernel version:{}".format(__version__))
2422

23+
import os
24+
import sys
25+
from sas_kernel.version import __version__
2526

26-
SVEM_FLAG = '--single-version-externally-managed'
27-
if SVEM_FLAG in sys.argv:
28-
sys.argv.remove(SVEM_FLAG)
27+
svem_flag = '--single-version-externally-managed'
28+
if svem_flag in sys.argv:
29+
sys.argv.remove(svem_flag)
2930

3031

3132
class InstallWithKernelspec(install):
@@ -38,10 +39,9 @@ def run(self):
3839
# If the NO_KERNEL_INSTALL env variable is set then skip the kernel installation.
3940
return
4041
else:
41-
import sas_kernel.install as kernel_install
42+
from sas_kernel import install as kernel_install
4243
kernel_install.main(argv=sys.argv)
4344

44-
4545
setup(name='SAS_kernel',
4646
version=__version__,
4747
packages=find_packages(),

0 commit comments

Comments
 (0)