Skip to content
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.

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

Drop Py3.6 support per NEP 29 #4469

Merged
merged 1 commit into from
Dec 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ environment:
CACHE_DIR: "%LOCALAPPDATA%\\pip\\Cache"

matrix:
- PYTHON: "C:\\Python36-x64"
PYTHON_VERSION: "3.6"
PYTHON_ARCH: "64"

- PYTHON: "C:\\Python37-x64"
PYTHON_VERSION: "3.7"
PYTHON_ARCH: "64"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
os: [ubuntu, macos]
python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
python-version: [3.7, 3.8, 3.9, pypy-3.7]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-20.04, macos-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
strategy:
matrix:
os: [ubuntu, macos]
python-version: [3.6, 3.7, 3.8, 3.9]
python-version: [3.7, 3.8, 3.9]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Install
=======

NetworkX requires Python 3.6, 3.7, 3.8, or 3.9. If you do not already
NetworkX requires Python 3.7, 3.8, or 3.9. If you do not already
have a Python environment configured on your computer, please see the
instructions for installing the full `scientific Python stack
<https://scipy.org/install.html>`_.
Expand Down
3 changes: 2 additions & 1 deletion doc/release/release_dev.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ Highlights
This release is the result of X of work with over X pull requests by
X contributors. Highlights include:

- Dropped support for Python 3.6.
- NumPy, SciPy, Matplotlib, and pandas are now default requirements.

Improvements
------------

- [`#4319 <https://github.com/networkx/networkx/pull/4319>`_]
pagerank uses scipy by default now.
pagerank uses scipy by default now.
- [`#4317 <https://github.com/networkx/networkx/pull/4317>`_]
New ``source`` argument to ``has_eulerian_path`` to look for path starting at
source.
Expand Down
4 changes: 2 additions & 2 deletions networkx/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

import sys

if sys.version_info[:2] < (3, 6):
m = "Python 3.6 or later is required for NetworkX (%d.%d detected)."
if sys.version_info[:2] < (3, 7):
m = "Python 3.7 or later is required for NetworkX (%d.%d detected)."
raise ImportError(m % sys.version_info[:2])
del sys

Expand Down
1 change: 0 additions & 1 deletion networkx/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ def get_info(dynamic=True):
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
print("To install, run 'python setup.py install'")
print()

if sys.version_info[:2] < (3, 6):
if sys.version_info[:2] < (3, 7):
error = (
"NetworkX 2.5+ requires Python 3.6 or later (%d.%d detected). \n"
"NetworkX 2.6+ requires Python 3.7 or later (%d.%d detected). \n"
"For Python 2.7, please install version 2.2 using: \n"
"$ pip install 'networkx==2.2'" % sys.version_info[:2]
)
Expand Down Expand Up @@ -162,6 +162,6 @@ def parse_requirements_file(filename):
package_data=package_data,
install_requires=install_requires,
extras_require=extras_require,
python_requires=">=3.6",
python_requires=">=3.7",
zip_safe=False,
)