Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Othoz/gcsfs
Browse files Browse the repository at this point in the history
  • Loading branch information
birnbaum committed Aug 27, 2019
2 parents f997c84 + 237755a commit 54d8bc2
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ python:
- "3.5"

before_install:
- openssl aes-256-cbc -K $encrypted_b8e3bf9ce0e9_key -iv $encrypted_b8e3bf9ce0e9_iv -in .travis/service-account-key.json.enc -out $HOME/service-account-key.json -d
# We only run the test suite when building the repository under Othoz/gcsfs because only here we have access too the environment variables to decrypt the GCS service account key
- 'if [ "$TRAVIS_REPO_SLUG" = "Othoz/gcsfs" ]; then openssl aes-256-cbc -K $encrypted_b8e3bf9ce0e9_key -iv $encrypted_b8e3bf9ce0e9_iv -in .travis/service-account-key.json.enc -out $HOME/service-account-key.json -d; fi'
- export GOOGLE_APPLICATION_CREDENTIALS=$HOME/service-account-key.json
- export TEST_BUCKET=othoz-gcsfs-tests

Expand All @@ -15,7 +16,7 @@ install:

script:
- flake8
- pytest --cov=fs_gcsfs --cov-branch --cov-report=xml --numprocesses=16
- 'if [ "$TRAVIS_REPO_SLUG" = "Othoz/gcsfs" ]; then pytest --cov=fs_gcsfs --cov-branch --cov-report=xml --numprocesses=16; fi'

deploy:
provider: pypi
Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,4 +186,4 @@
# -- Options for intersphinx extension ---------------------------------------

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'https://docs.python.org/': None}
intersphinx_mapping = {'https://docs.python.org/': None}
8 changes: 7 additions & 1 deletion fs_gcsfs/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# flake8: noqa
from pkg_resources import get_distribution, DistributionNotFound

from ._gcsfs import GCSFS
from ._version import __version__

try:
__version__ = get_distribution(__name__).version
except DistributionNotFound:
# package is not installed
pass
1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
[flake8]
show_source = True
max-line-length = 160
exclude = .git,__pycache__,docs
ignore = E402

[coverage:run]
Expand Down
8 changes: 2 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
import os
from setuptools import setup

version_namespace = {}
with open("fs_gcsfs/_version.py") as f:
exec(f.read(), version_namespace) # nosec # pylint: disable=exec-used

here = os.path.abspath(os.path.dirname(__file__))

with open(os.path.join(here, "README.rst"), encoding="utf-8") as f:
long_description = "\n" + f.read()


if __name__ == "__main__":
setup(
name="fs-gcsfs",
version=version_namespace["__version__"],
use_scm_version=True,
author="Othoz GmbH",
author_email="wiesner@othoz.com",
description="A PyFilesystem interface to Google Cloud Storage",
Expand All @@ -29,6 +24,7 @@
packages=["fs_gcsfs"],
license="MIT",
python_requires=">=3.5",
setup_requires=['setuptools_scm'],
install_requires=[
"fs~=2.0",
"google-cloud-storage~=1.0",
Expand Down

0 comments on commit 54d8bc2

Please sign in to comment.