Skip to content

Commit e5894cb

Browse files
Merge pull request #31 from developmentseed/dropPython3.6
drop python 3.6 and update CI
2 parents 744da3a + 2896f4e commit e5894cb

File tree

4 files changed

+119
-11
lines changed

4 files changed

+119
-11
lines changed

.github/workflows/ci.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches:
6+
- master
7+
tags:
8+
- '*'
9+
pull_request:
410

511
jobs:
612
tests:
7-
if: github.event_name == 'push' || github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != github.repository
813
runs-on: ubuntu-latest
914
strategy:
1015
matrix:
11-
python-version: [3.6, 3.7, 3.8, 3.9]
16+
python-version: [3.7, 3.8, 3.9]
1217

1318
steps:
1419
- uses: actions/checkout@v2
@@ -43,7 +48,7 @@ jobs:
4348
publish:
4449
needs: [tests]
4550
runs-on: ubuntu-latest
46-
if: contains(github.ref, 'tags')
51+
if: startsWith(github.event.ref, 'refs/tags') || github.event_name == 'release'
4752
steps:
4853
- uses: actions/checkout@v2
4954
- name: Set up Python

.gitignore

Lines changed: 101 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,104 @@
1-
*.egg-info/
1+
# Byte-compiled / optimized / DLL files
22
__pycache__/
3-
.tox
3+
*.py[cod]
4+
*$py.class
5+
6+
# C extensions
7+
*.so
8+
9+
# Distribution / packaging
10+
.Python
11+
env/
12+
build/
13+
develop-eggs/
14+
dist/
15+
downloads/
16+
eggs/
17+
.eggs/
18+
lib/
19+
lib64/
20+
parts/
21+
sdist/
22+
var/
23+
wheels/
24+
*.egg-info/
25+
.installed.cfg
26+
*.egg
27+
28+
# PyInstaller
29+
# Usually these files are written by a python script from a template
30+
# before PyInstaller builds the exe, so as to inject date/other infos into it.
31+
*.manifest
32+
*.spec
33+
34+
# Installer logs
35+
pip-log.txt
36+
pip-delete-this-directory.txt
37+
38+
# Unit test / coverage reports
39+
htmlcov/
40+
.tox/
441
.coverage
42+
.coverage.*
43+
.cache
44+
nosetests.xml
45+
coverage.xml
46+
*.cover
47+
.hypothesis/
48+
49+
# Translations
50+
*.mo
51+
*.pot
52+
53+
# Django stuff:
54+
*.log
55+
local_settings.py
56+
57+
# Flask stuff:
58+
instance/
59+
.webassets-cache
60+
61+
# Scrapy stuff:
62+
.scrapy
63+
64+
# Sphinx documentation
65+
docs/_build/
66+
67+
# PyBuilder
68+
target/
69+
70+
# Jupyter Notebook
71+
.ipynb_checkpoints
72+
73+
# pyenv
74+
.python-version
75+
76+
# celery beat schedule file
77+
celerybeat-schedule
78+
79+
# SageMath parsed files
80+
*.sage.py
81+
82+
# dotenv
83+
.env
84+
85+
# virtualenv
86+
.venv
87+
venv/
88+
ENV/
89+
90+
# Spyder project settings
91+
.spyderproject
92+
.spyproject
93+
94+
# Rope project settings
95+
.ropeproject
96+
97+
# mkdocs documentation
98+
/site
99+
100+
# mypy
5101
.mypy_cache/
102+
103+
104+
.pytest_cache

CHANGELOG.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,14 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [0.3.0] - TBD
9+
10+
### Removed
11+
- Drop python 3.6 support
12+
813
## [0.2.3] - 2021-05-05
914

10-
## Fixed
15+
### Fixed
1116
- incorrect version number set in `__init__.py`
1217

1318
## [0.2.2] - 2020-12-29
@@ -20,7 +25,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2025

2126
Although the type file was added in `0.2.0` it wasn't included in the distributed package. Use this version `0.2.1` for type annotations.
2227

23-
## Fixed
28+
### Fixed
2429
- Correct package type information files
2530

2631
## [0.2.0] - 2020-08-06

setup.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
setup(
1717
name="geojson-pydantic",
1818
version="0.2.3",
19-
python_requires=">=3.6",
19+
python_requires=">=3.7",
2020
description=u"""Pydantic data models for the GeoJSON spec""",
2121
long_description=readme,
2222
long_description_content_type="text/markdown",
@@ -27,15 +27,14 @@
2727
"Programming Language :: Python :: 3.9",
2828
"Programming Language :: Python :: 3.8",
2929
"Programming Language :: Python :: 3.7",
30-
"Programming Language :: Python :: 3.6",
3130
"Topic :: Scientific/Engineering :: GIS",
3231
],
3332
keywords="geojson pydantic",
3433
author=u"Drew Bollinger",
3534
author_email="drew@developmentseed.org",
3635
url="https://github.com/developmentseed/geojson-pydantic",
3736
license="MIT",
38-
packages=find_packages(exclude=["ez_setup", "examples", "tests"]),
37+
packages=find_packages(exclude=["tests"]),
3938
install_requires=inst_reqs,
4039
extras_require=extra_reqs,
4140
package_data={"geojson_pydantic": ["*.typed"]},

0 commit comments

Comments
 (0)