Skip to content

Commit

Permalink
fix filenames sorting
Browse files Browse the repository at this point in the history
1. fix filenames sorting
2. move version to a separate file
  • Loading branch information
Tagar committed Nov 6, 2017
1 parent c0afd8c commit 5db440b
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 3 deletions.
15 changes: 14 additions & 1 deletion abalon/spark/sparkutils.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
# -*- coding: utf-8 -*-
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


###########################################################################################################
Expand Down Expand Up @@ -118,7 +131,7 @@ def debug_print (message):
files = []
for f in fs.listStatus(hadoop.fs.Path(src_dir)):
if f.isFile():
files.append(f.getPath())
files.append(str(f.getPath()))
if not files:
raise ValueError("Source directory {} is empty".format(src_dir))
# determine order of files in which they will be written:
Expand Down
15 changes: 15 additions & 0 deletions abalon/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# -*- coding: utf-8 -*-
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

version = '1.4.0'
23 changes: 21 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,30 @@
# -*- coding: utf-8 -*-
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.


from setuptools import setup, find_packages

import imp

version = imp.load_source(
'airflow.version', os.path.join('abalon', 'version.py')).version

# http://setuptools.readthedocs.io/en/latest/setuptools.html

setup(name='abalon',
version='1.3.0',
packages=find_packages(),
version=version,
packages=find_packages(exclude=['tests*']),

# install_requires=['docutils>=0.3'],

Expand Down

0 comments on commit 5db440b

Please sign in to comment.