Skip to content

Commit

Permalink
Drop Python 3.6 support (microsoft#482)
Browse files Browse the repository at this point in the history
* Drop Python 3.6 support

* pandas 0.23.2+ required for Python 3.7+ support

* Update environment.yml too
  • Loading branch information
adamjstewart authored and remtav committed May 26, 2022
1 parent 9039aa8 commit 27393da
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
exclude:
- os: windows-latest
python-version: 3.6
python-version: [3.7, 3.8, 3.9]
steps:
- name: Clone repo
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies:
- pip
- pycocotools
- pyproj>=2.2
- python>=3.6
- python>=3.7
- pytorch>=1.7
- rarfile>=3
- rasterio>=1.0.16
Expand All @@ -30,7 +30,7 @@ dependencies:
- omegaconf>=2.1
- open3d>=0.11.2
- opencv-python
- pandas>=0.19.1
- pandas>=0.23.2
- pillow>=2.9
- pydocstyle[toml]>=6.1
- pytest>=6
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ requires = [
build-backend = "setuptools.build_meta"

[tool.black]
target-version = ["py36", "py37", "py38", "py39"]
target-version = ["py37", "py38", "py39"]
color = true
skip_magic_trailing_comma = true

Expand Down
11 changes: 4 additions & 7 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ classifiers =
Development Status :: 3 - Alpha
Intended Audience :: Science/Research
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 All @@ -28,8 +27,6 @@ setup_requires =
# setuptools 42+ required for metadata.license_files support in setup.cfg
setuptools>=42
install_requires =
# dataclasses was added in Python 3.7
dataclasses;python_version<'3.7'
einops
# fiona 1.5+ required for fiona.transform module
fiona>=1.5
Expand Down Expand Up @@ -63,7 +60,7 @@ install_requires =
torchmetrics>=0.7
# torchvision 0.10+ required for torchvision.utils.draw_segmentation_masks
torchvision>=0.10
python_requires = >= 3.6
python_requires = >= 3.7
packages = find:

[options.packages.find]
Expand All @@ -73,14 +70,14 @@ include = torchgeo*
# Optional dataset requirements
datasets =
h5py
# laspy 2+ required for Python 3.6+ support
# laspy 2+ required for Python 3.7+ support
laspy>=2
# open3d 0.11.2+ required to avoid GLFW error:
# https://github.com/isl-org/Open3D/issues/1550
open3d>=0.11.2
opencv-python
# pandas 0.19.1+ required for python 3.6 support
pandas>=0.19.1
# pandas 0.23.2+ required for python 3.7 support
pandas>=0.23.2
pycocotools
# radiant-mlhub 0.2.1+ required for api_key bugfix:
# https://github.com/radiantearth/radiant-mlhub/pull/48
Expand Down

0 comments on commit 27393da

Please sign in to comment.