IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-24 07:16:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove Python 2.7 support from the wheel package.

Browse Source
This commit is contained in:
Dave Page 2020-04-27 21:20:43 +05:30 committed by Akshay Joshi
parent b695329d2d
commit b716800474
2 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/pip/build.sh
View File

@ -102,7 +102,7 @@ echo recursive-include pgadmin4 \* > pip-build/MANIFEST.in
# Run the build # Run the build
echo Building wheel... echo Building wheel...
cd pip-build cd pip-build
python ../pkg/pip/setup_pip.py bdist_wheel --universal python ../pkg/pip/setup_pip.py bdist_wheel
cd ../ cd ../
# Get the build # Get the build

60
pkg/pip/setup_pip.py
View File

@ -7,68 +7,51 @@
# #
########################################################################## ##########################################################################
import builtins
import os import os
import sys import sys
from codecs import open
from importlib.machinery import SourceFileLoader
from setuptools import setup from setuptools import setup
from codecs import open
if sys.version_info[0] >= 3:
import builtins # Load a source file
else: def load_source(name, path):
import __builtin__ as builtins if not os.path.exists(path):
print("ERROR: Could not find %s" % path)
sys.exit(1)
return SourceFileLoader(name, path).load_module()
# Ensure the global server mode is set. # Ensure the global server mode is set.
builtins.SERVER_MODE = None builtins.SERVER_MODE = None
"""This script helps to generate PIP packages"""
# Get the requirements list for the current version of Python # Get the requirements list for the current version of Python
req_file = '../requirements.txt' req_file = '../requirements.txt'
with open(req_file, 'r') as reqf: with open(req_file, 'r') as req_lines:
if sys.version_info[0] >= 3: requires = req_lines.read().splitlines()
required = reqf.read().splitlines()
else:
required = reqf.read().decode("utf-8").splitlines()
# Remove any requirements with environment specifiers. These # Remove any requirements with environment specifiers. These
# must be explicitly listed in extras_require below. # must be explicitly listed in extras_require below.
for index, req in enumerate(required): for index, req in enumerate(requires):
if ";" in req or req.startswith("#") or req == "": if ";" in req or req.startswith("#") or req == "":
required.remove(req) requires.remove(req)
continue continue
# Ensure the Wheel will use psycopg2-binary, not the source distro # Ensure the Wheel will use psycopg2-binary, not the source distro
if 'psycopg2' in req: if 'psycopg2' in req:
required[index] = req.replace('psycopg2', 'psycopg2-binary') requires[index] = req.replace('psycopg2', 'psycopg2-binary')
# Get the app version # Get the version
if sys.version_info[:2] >= (3, 3): config = load_source('APP_VERSION', '../web/config.py')
from importlib.machinery import SourceFileLoader
def load_source(name, path):
if not os.path.exists(path):
print("ERROR: Could not find %s" % path)
sys.exit(1)
return SourceFileLoader(name, path).load_module()
else:
import imp
def load_source(name, path):
if not os.path.exists(path):
print("ERROR: Could not find %s" % path)
sys.exit(1)
return imp.load_source(name, path)
modl = load_source('APP_VERSION', '../web/config.py')
setup( setup(
name='pgadmin4', name='pgadmin4',
version=modl.APP_VERSION, version=config.APP_VERSION,
description='PostgreSQL Tools', description='PostgreSQL Tools',
long_description='Administration and management tools for ' long_description='Administration and management tools for '
@ -86,7 +69,6 @@ setup(
'Development Status :: 5 - Production/Stable', 'Development Status :: 5 - Production/Stable',
# Supported programming languages # Supported programming languages
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.6',
@ -100,7 +82,7 @@ setup(
include_package_data=True, include_package_data=True,
install_requires=required, install_requires=requires,
entry_points={ entry_points={
'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4.__init__:main'], 'console_scripts': ['pgadmin4=pgadmin4.pgAdmin4.__init__:main'],