Skip to content

Commit

Permalink
Additional python version wrangling.
Browse files Browse the repository at this point in the history
  • Loading branch information
metasim committed Oct 10, 2019
1 parent 414155c commit eb40b60
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ package object rasterframes extends StandardColumns
// Don't make this a `lazy val`... breaks Spark assemblies for some reason.
protected def logger: Logger = Logger(LoggerFactory.getLogger(getClass.getName))

@transient
private[rasterframes]
val rfConfig = ConfigFactory.load().getConfig("rasterframes")
def rfConfig = ConfigFactory.load().getConfig("rasterframes")

/** The generally expected tile size, as defined by configuration property `rasterframes.nominal-tile-size`.*/
@transient
Expand Down
2 changes: 1 addition & 1 deletion project/PythonBuildPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ object PythonBuildPlugin extends AutoPlugin {
val dest = (Compile / packageBin / artifactPath).value.getParentFile
val art = (Python / packageBin / artifact).value
val ver = version.value
dest / s"${art.name}-$ver-py2.py3-none-any.whl"
dest / s"${art.name}-$ver-py3-none-any.whl"
},
testQuick := pySetup.toTask(" test").value,
executeTests := Def.task {
Expand Down
4 changes: 2 additions & 2 deletions pyrasterframes/src/main/python/setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
license_files = LICENSE.txt

[bdist_wheel]
universal=1
universal = 0

[aliases]
test=pytest
test = pytest

[tool:pytest]
addopts = --verbose
Expand Down
79 changes: 50 additions & 29 deletions pyrasterframes/src/main/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,26 @@ def initialize_options(self):
def dest_file(self, src_file):
return path.splitext(src_file)[0] + '.ipynb'

pytz = 'pytz'
shapely = 'Shapely>=1.6.0'
pyspark ='pyspark==2.4.4'
numpy = 'numpy>=1.12.0'
matplotlib ='matplotlib'
pandas = 'pandas>=0.24.2'
geopandas = 'geopandas'
requests = 'requests'
pytest_runner = 'pytest-runner'
setuptools = 'setuptools>=0.8'
ipython = 'ipython==6.2.1'
ipykernel = 'ipykernel==4.8.0'
pweave = 'Pweave==0.30.3'
fiona = 'fiona==1.8.6'
rasterio = 'rasterio>=1.0.0'
folium = 'folium'
pytest = 'pytest>4.0.0,<5.0.0'
pypandoc = 'pypandoc'
boto3 = 'boto3'

setup(
name='pyrasterframes',
description='Access and process geospatial raster data in PySpark DataFrames',
Expand All @@ -144,40 +164,41 @@ def dest_file(self, src_file):
'Bug Reports': 'https://github.com/locationtech/rasterframes/issues',
'Source': 'https://github.com/locationtech/rasterframes',
},
python_requires=">=3.5",
install_requires=[
'pytz',
'Shapely>=1.6.0',
'pyspark==2.4.4',
'numpy>=1.7',
'pandas>=0.24.2',
pytz,
shapely,
pyspark,
numpy,
pandas
],
setup_requires=[
'pytz',
'Shapely>=1.6.0',
'pyspark==2.4.4',
'numpy>=1.7',
'matplotlib<3.0.0',
'pandas>=0.24.2',
'geopandas',
'requests',
'pytest-runner',
'setuptools>=0.8',
'ipython==6.2.1',
'ipykernel==4.8.0',
'Pweave==0.30.3',
'fiona==1.8.6',
'rasterio>=1.0.0', # for docs
'folium',
pytz,
shapely,
pyspark,
numpy,
matplotlib,
pandas,
geopandas,
requests,
pytest_runner,
setuptools,
ipython,
ipykernel,
pweave,
fiona,
rasterio,
folium
],
tests_require=[
'pytest>4.0.0,<5.0.0',
'pypandoc',
'numpy>=1.7',
'Shapely>=1.6.0',
'pandas>=0.24.2',
'rasterio>=1.0.0',
'boto3',
'Pweave==0.30.3',
pytest,
pypandoc,
numpy,
shapely,
pandas,
rasterio,
boto3,
pweave
],
packages=[
'pyrasterframes',
Expand Down

0 comments on commit eb40b60

Please sign in to comment.