Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[pre-commit.ci] pre-commit autoupdate #98

Merged
merged 7 commits into from
Mar 15, 2021
Merged

[pre-commit.ci] pre-commit autoupdate #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b8d94a0
v0.3.11 release (#74)
sbrugman Dec 7, 2020
73efc3c
Merge branch 'master' into release/0.3.12
tomcis Jan 21, 2021
89add7f
Merge pull request #84 from ing-bank/release/0.3.12
tomcis Jan 21, 2021
830b436
Merge branch 'release/0.3.13'
tomcis Feb 4, 2021
68f53fa
Release/0.3.14 (#92)
sbrugman Feb 8, 2021
e661970
Docs update (#96)
sbrugman Feb 9, 2021
8993975
[pre-commit.ci] pre-commit autoupdate
pre-commit-ci[bot] Mar 15, 2021
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
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ repos:
files: '.*'
args: [ --profile=black, --project=popmon, --thirdparty histogrammar, --thirdparty pybase64 ]
- repo: https://gitlab.com/pycqa/flake8
rev: "3.8.4"
rev: "3.9.0"
hooks:
- id: flake8
args: [ "--select=E9,F63,F7,F82"]
- repo: https://github.com/asottile/pyupgrade
rev: v2.9.0
rev: v2.10.0
hooks:
- id: pyupgrade
args: ['--py36-plus','--exit-zero-even-if-changed']
5 changes: 5 additions & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Release notes
=============


Version 0.3.14, Feb 2021
------------------------
* Pin ``histogrammar`` version for backwards compatibility

Version 0.3.13, Feb 2021
------------------------
* ``Spark 3.0`` support (``histogrammar`` update) (#87)
Expand Down
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ Announcements
Spark 3.0
---------

With Spark 3.0, based on Scala 2.12, make sure to pick up the correct `histogrammar` jar file:
With Spark 3.0, based on Scala 2.12, make sure to pick up the correct `histogrammar` jar files:

.. code-block:: python

spark = SparkSession.builder.config("spark.jars.packages", "io.github.histogrammar:histogrammar-sparksql_2.12:1.0.11").getOrCreate()
spark = SparkSession.builder.config("spark.jars.packages", "io.github.histogrammar:histogrammar_2.12:1.0.11,io.github.histogrammar:histogrammar-sparksql_2.12:1.0.11").getOrCreate()

For Spark 2.X compiled against scala 2.11, in the string above simply replace 2.12 with 2.11.

Expand Down
2 changes: 1 addition & 1 deletion docs/source/configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ Spark usage
from pyspark.sql import SparkSession

# downloads histogrammar jar files if not already installed, used for histogramming of spark dataframe
spark = SparkSession.builder.config('spark.jars.packages','io.github.histogrammar:histogrammar-sparksql_2.12:1.0.11').getOrCreate()
spark = SparkSession.builder.config("spark.jars.packages", "io.github.histogrammar:histogrammar_2.12:1.0.11,io.github.histogrammar:histogrammar-sparksql_2.12:1.0.11").getOrCreate()

# load a dataframe
spark_df = spark.read.format('csv').options(header='true').load('file.csv')
Expand Down
2 changes: 1 addition & 1 deletion popmon/notebooks/popmon_tutorial_advanced.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"source": [
"if pyspark_installed:\n",
" spark = SparkSession.builder.config(\n",
" \"spark.jars.packages\", \"io.github.histogrammar:histogrammar-sparksql_2.12:1.0.11\"\n",
" \"spark.jars.packages\", \"io.github.histogrammar:histogrammar_2.12:1.0.11,io.github.histogrammar:histogrammar-sparksql_2.12:1.0.11\"\n",
" ).getOrCreate()\n",
"\n",
" sdf = spark.createDataFrame(df)\n",
Expand Down
4 changes: 2 additions & 2 deletions popmon/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""THIS FILE IS AUTO-GENERATED BY SETUP.PY."""

name = "popmon"
version = "0.3.13"
full_version = "0.3.13"
version = "0.3.14"
full_version = "0.3.14"
release = True
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
numpy>=1.18.0
pandas>=0.25.1
scipy>=1.5.2
histogrammar>=1.0.12
histogrammar==1.0.12
phik
jinja2
tqdm
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

MAJOR = 0
REVISION = 3
PATCH = 13
PATCH = 14
DEV = False
# NOTE: also update version at: README.rst

Expand Down