Skip to content

Commit

Permalink
release prep
Browse files Browse the repository at this point in the history
  • Loading branch information
vreuter committed Feb 27, 2019
1 parent 29451dd commit d070edb
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 29 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ install:
- pip install .
- pip install -r requirements/requirements-dev.txt
- pip install -r requirements/requirements-test.txt
script: pytest
script: pytest --cov=geofetch
branches:
only:
- dev
- master

6 changes: 2 additions & 4 deletions docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Changelog

## geofetch v0.1 (unreleased)

- First semi-functional release.

## geofetch v0.1 (2019-02-27)
- First semi-functional release.
2 changes: 1 addition & 1 deletion geofetch/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1-dev"
__version__ = "0.1"
2 changes: 1 addition & 1 deletion geofetch/geofetch.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import re
import subprocess
import sys
from utils import Accession
from .utils import Accession


# A set of hard-coded keys if you want to limit to just a few instead of taking
Expand Down
2 changes: 0 additions & 2 deletions requirements/requirements-all.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
attmap>=0.1.8
colorama>=0.3.9
pandas>=0.20.2
pyyaml>=3.12
peppy>=0.19.1

32 changes: 13 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,27 @@
import sys

PACKAGE = "geofetch"
REQDIR = "requirements"

# Additional keyword arguments for setup().
extra = {}

# Ordinary dependencies
DEPENDENCIES = []
with open("requirements/requirements-all.txt", "r") as reqs_file:
for line in reqs_file:
if not line.strip():
continue
#DEPENDENCIES.append(line.split("=")[0].rstrip("<>"))
DEPENDENCIES.append(line)

# numexpr for pandas
try:
import numexpr
except ImportError:
# No numexpr is OK for pandas.
pass
else:
# pandas 0.20.2 needs updated numexpr; the claim is 2.4.6, but that failed.
DEPENDENCIES.append("numexpr>=2.6.2")
def read_reqs(reqs_name):
deps = []
with open(os.path.join(REQDIR, "requirements-{}.txt".format(reqs_name)), 'r') as f:
for l in f:
if not l.strip():
continue
#deps.append(l.split("=")[0].rstrip("<>"))
deps.append(l)
return deps


# 2to3
if sys.version_info >= (3, ):
extra["use_2to3"] = True
extra["install_requires"] = DEPENDENCIES
extra["install_requires"] = read_reqs("all")


# Additional files to include with package
Expand Down Expand Up @@ -85,7 +79,7 @@ def get_static(name, condition=None):
scripts=scripts,
include_package_data=True,
test_suite="tests",
tests_require=(["mock", "pytest"]),
tests_require=read_reqs("dev"),
setup_requires=(["pytest-runner"] if {"test", "pytest", "ptr"} & set(sys.argv) else []),
**extra
)

0 comments on commit d070edb

Please sign in to comment.