#437 Drop Python 2.6 support
Merged 2 years ago by onosek. Opened 2 years ago by onosek.
onosek/fedpkg drop_python_2.6  into  master

file modified
+5 -5
@@ -3,7 +3,7 @@ 

  

  This is the fedpkg project, which mostly is a subclass of the rpkg project.

  

- rpkg works with Python 2.6, 2.7, 3.6, 3.7 and 3.8.

+ rpkg works with Python 2.7, 3.6, 3.7 and 3.8.

  

  License

  =======
@@ -17,14 +17,14 @@ 

  ----------------------------------

  

  fedpkg is available in Fedora and EPEL repositories. It can be installed with

- package manager command. There is Python 3 package for Fedora and Python 2

- package in EPEL6/7 and Python 3 package for EPEL8.

+ package manager command. There is Python 3 package for Fedora and EPEL8;

+ and Python 2 package in EPEL7.

  

  Install in a Fedora system::

  

      sudo dnf install fedpkg

  

- Install in EPEL6 or EPEL7::

+ Install in EPEL7::

  

      sudo yum install fedpkg

  
@@ -35,7 +35,7 @@ 

  ============

  

  You are welcome to write patches to fix or improve rpkg. All code should work

- with Python 2.6, 2.7, and 3. Before you create a PR to propose your changes,

+ with Python 2.7 and 3. Before you create a PR to propose your changes,

  make sure

  

  Sign-off commit

file modified
+3 -12
@@ -1,7 +1,6 @@ 

  #!/usr/bin/python

  

  import os

- import sys

  

  from setuptools import find_packages, setup

  
@@ -23,20 +22,13 @@ 

  

  with open(requirements, 'r') as f:

      install_requires = [line.strip() for line in f]

+ install_requires += [

+     'distro',

+ ]

  

  with open(tests_requirements, 'r') as f:

      tests_require = [line.strip() for line in f]

  

- ver = sys.version_info

- if ver[0] <= 2 and ver[1] < 7:

-     tests_require += [

-         'unittest2'

-     ]

- else:

-     install_requires += [

-         'distro',

-     ]

- 

  

  setup(

      name="fedpkg",
@@ -72,7 +64,6 @@ 

          'Topic :: Software Development :: Build Tools',

          'License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)',

          'Programming Language :: Python :: 2',

-         'Programming Language :: Python :: 2.6',

          'Programming Language :: Python :: 2.7',

          'Programming Language :: Python :: 3',

          'Programming Language :: Python :: 3.6',

file modified
+1 -2
@@ -1,10 +1,9 @@ 

  [tox]

- envlist = py26,py27,py36,py37,flake8

+ envlist = py27,py36,py37,flake8

  

  [testenv]

  sitepackages=False

  basepython=

-     py26: {env:TOXPYTHON:python2.6}

      py27: {env:TOXPYTHON:python2.7}

      py36: {env:TOXPYTHON:python3.6}

      py37: {env:TOXPYTHON:python3.7}

Removed Python 2.6 dependencies and mentions mostly from metadata
and help files.

Signed-off-by: Ondrej Nosek onosek@redhat.com

Pull-Request has been merged by onosek

2 years ago