diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b6382550f..767777e83 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,23 +10,15 @@ jobs: runs-on: ${{ matrix.runs-on }} strategy: matrix: - python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-alpha.2", "pypy-3.6", "pypy-3.7"] + python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-alpha.2", "pypy-3.6", "pypy-3.7"] with-opt-deps: [false, true] runs-on: [ubuntu-latest] exclude: # Some of the dependencies don't work on old Python versions - - python-version: "3.4" - with-opt-deps: true - - python-version: "3.5" - with-opt-deps: true - python-version: "3.6" with-opt-deps: true - python-version: "pypy-3.6" with-opt-deps: true - include: - - python-version: "3.4" - with-opt-deps: false - runs-on: ubuntu-18.04 steps: - uses: actions/checkout@v2 diff --git a/setup.py b/setup.py index 11a13c882..2fab2604d 100644 --- a/setup.py +++ b/setup.py @@ -106,21 +106,11 @@ if version: fd.write(' pass\n') fd.close() -if sys.version_info < (3, 4, 0): +if sys.version_info < (3, 6, 0): sys.stderr.write("Limnoria requires Python 3.6 or newer.") sys.stderr.write(os.linesep) sys.exit(-1) -if sys.version_info < (3, 6, 0) \ - and os.environ.get('LIMNORIA_WARN_OLD_PYTHON') != '0': - sys.stderr.write('====================================================\n') - sys.stderr.write('Limnoria support for Python versions older than 3.6\n') - sys.stderr.write('is deprecated and may be removed in the near future.\n') - sys.stderr.write('You should upgrade ASAP.\n') - sys.stderr.write('Install will continue in 60s.\n') - sys.stderr.write('====================================================\n') - time.sleep(60) - plugins = [s for s in os.listdir('plugins') if os.path.exists(os.path.join('plugins', s, 'plugin.py'))]