Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

language: python
python:
- 3.6
- 3.5
- 3.4
- 3.9

# Command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
install: pip install -U tox-travis
Expand All @@ -25,4 +23,4 @@ deploy:
on:
tags: true
repo: aldnav/geohash
python: 3.6
python: 3.9
2 changes: 1 addition & 1 deletion CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 3.4, 3.5 and 3.6, and for PyPy. Check
3. The pull request should work for Python 3.9, and for PyPy. Check
https://travis-ci.org/aldnav/geohash/pull_requests
and make sure that the tests pass for all supported Python versions.

Expand Down
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ include CONTRIBUTING.rst
include HISTORY.rst
include LICENSE
include README.rst
include geohash/bin/**/*.*
recursive-include geohash/bin *

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should also be added in master prior to this PR. Missing in PR #6


recursive-include tests *
recursive-exclude * __pycache__
Expand Down
Binary file modified geohash/bin/darwin/arm/geohash.so
Binary file not shown.
22 changes: 11 additions & 11 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
bumpversion==0.5.3
wheel==0.38.1
watchdog==0.9.0
flake8==3.5.0
tox==3.5.2
coverage==4.5.1
Sphinx==1.8.1
twine==1.12.1
bump2version==1.0.1

Copy link
Copy Markdown
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should start using pip-tools

bumpversion==0.6.0
watchdog==3.0.0
flake8==6.0.0
tox==4.4.11
coverage==7.2.3
Sphinx==6.1.3
twine==4.0.2

pytest==3.8.2
pytest-runner==4.2
cffi>=1.12.3
pytest==7.3.0
pytest-runner==6.0.0
cffi==1.15.1
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ exclude = docs
test = pytest

[tool:pytest]
collect_ignore = ['setup.py']
addopts = --ignore=setup.py

5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
'Natural Language :: English',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.9',
],
description="Encode/decode Geohashes http://geohash.org",
install_requires=requirements,
Expand Down
6 changes: 2 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
[tox]
envlist = py34, py35, py36, flake8
envlist = py39, flake8

[travis]
python =
3.6: py36
3.5: py35
3.4: py34
3.9: py39

[testenv:flake8]
basepython = python
Expand Down