Skip to content

Fix Issue #14 (Add support for Python 3.8) #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Issue #14 (Add support for Python 3.8) #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
import platform
import sys

from distutils.core import setup
from setuptools import setup

sys.path.insert(1, os.path.abspath('./src'))

import wixpy
import dependencies

IS_PY2 = sys.version_info.major < 3
IS_MSW = os.name == 'nt'
Expand All @@ -45,6 +44,7 @@
maintainer=wixpy.MAINTAINER,
maintainer_email=wixpy.MAINTAINER_EMAIL,
license=wixpy.LICENSE,
install_requires=['distro'],
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
install_requires=['distro'],
install_requires=['distro'],
setup_requires=['distro'],

Required by new dependencies.py, which is imported in setup.py.

url=wixpy.URL,
download_url=wixpy.DOWNLOAD_URL,
long_description=wixpy.LONG_DESCRIPTION,
Expand All @@ -54,5 +54,7 @@
scripts=scripts,
)

import dependencies

if 'install' in sys.argv and not IS_MSW:
dependencies.install()
3 changes: 2 additions & 1 deletion utils/dist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

import platform
import distro

WINDOWS = 'Windows'
LINUX = 'Linux'
Expand Down Expand Up @@ -75,7 +76,7 @@

class SystemFacts(object):
def __init__(self):
self.family, self.version = platform.dist()[:2]
self.family, self.version = distro.linux_distribution()[:2]

# Workaround for Leap 15.0 bug
if not self.family and not self.version:
Expand Down