Merge pull request #72 from neighborhoods/switch_to_rivet

Switching to rivet, going open-source officially

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.7.1] 2021-09-02
+
+### Changed
+- Switched from `river` to open-source `rivet`
+
 ## [1.6.4] 2021-08-05
 
 ### Added

Pipfile

@@ -24,7 +24,7 @@ pandas = ">=0.25.3"
 pandas-gbq = "~=0.14"
 pandavro = "~=1.6"
 pyhive = {extras = ["hive", "presto"], version = "~=0.6.1"}
-river = {version="~=1.5", index="nhds"}
+rivet = "~=1.6"
 simple-salesforce = "~=1.1"
 
 [requires]

README.md

@@ -167,4 +167,4 @@ maintain awareness of what is being performed behind-the-scenes. If this
 is not desirable (as may be the case for notebooks, pipelines, usage of
 `honeycomb` within other packages, etc.), all non-logging output can be
 disabled with `hc.set_option('verbose', False)`. This also sets the
-corresponding `verbose` option in `river` to False.
+corresponding `verbose` option in `rivet` to False.

honeycomb/__danger.py

@@ -1,6 +1,6 @@
 from honeycomb import hive, meta
 
-import river as rv
+import rivet as rv
 
 
 def __nuke_table(table_name, schema):

honeycomb/_version.py

@@ -1,6 +1,6 @@
 __title__ = "honeycomb"
 __description__ = "Multi-source/engine querying tool"
 __url__ = "https://github.com/neighborhoods/honeycomb"
-__version__ = "1.6.4"
+__version__ = "1.7.1"
 __author__ = "George Wood (@Geoiv)"
 __author_email__ = "[email protected]"

honeycomb/append_table.py

@@ -1,4 +1,4 @@
-import river as rv
+import rivet as rv
 
 from honeycomb import check, meta, dtype_mapping
 from honeycomb.alter_table import add_partition

honeycomb/config.py

@@ -1,4 +1,4 @@
-import river as rv
+import rivet as rv
 
 _options = {
     'verbose': True

honeycomb/create_table/build_and_run_ddl_stmt.py

@@ -1,4 +1,4 @@
-import river as rv
+import rivet as rv
 
 from honeycomb import hive, meta
 from honeycomb.alter_table import add_partition
@@ -51,7 +51,7 @@ def build_and_run_ddl_stmt(df, table_name, schema, col_defs,
             Schema to use when writing a DataFrame to an Avro file. If not
             provided, one will be auto-generated.
     """
-    # Gets settings to pass to river on how to write the files in a
+    # Gets settings to pass to rivet on how to write the files in a
     # Hive-readable format
     storage_settings = meta.storage_type_specs[storage_type]['settings']
 

honeycomb/create_table/create_table_from_df.py

@@ -2,7 +2,7 @@
 import logging
 import sys
 
-import river as rv
+import rivet as rv
 
 from honeycomb import meta
 from honeycomb.create_table.build_and_run_ddl_stmt import (

honeycomb/create_table/flash_update_table_from_df.py

@@ -1,6 +1,6 @@
 import os
 
-import river as rv
+import rivet as rv
 
 from honeycomb import check, hive, meta
 from honeycomb.create_table.common import (
@@ -90,7 +90,7 @@ def flash_update_table_from_df(df, table_name, schema=None, dtypes=None,
     df, col_defs = prep_df_and_col_defs(
         df, dtypes, timezones, schema, storage_type)
 
-    # Gets settings to pass to river on how to write the files in a
+    # Gets settings to pass to rivet on how to write the files in a
     # Hive-readable format
     storage_settings = meta.storage_type_specs[storage_type]['settings']
 

honeycomb/meta.py

@@ -26,7 +26,7 @@
     },
     'json': {
         # Hive expects JSON data to be written differently than df.to_json()
-        # writes it by default. This is handled by river.
+        # writes it by default. This is handled by rivet.
         'settings': {'hive_format': True},
         'ddl': ("ROW FORMAT SERDE\n"
                 "'org.apache.hadoop.hive.serde2.JsonSerDe'\n"

setup.py

@@ -48,9 +48,7 @@ def run(self):
                   sys.executable))
 
         self.status('Uploading the package to PyPI via Twine…')
-        returned_error = os.system(
-            'twine upload dist/* '
-            '--repository-url http://pypi.neighborhoods.com/simple/')
+        returned_error = os.system('twine upload dist/* ')
         if returned_error:
             raise ValueError('Pushing to PyPi failed.')
 
@@ -86,7 +84,7 @@ def run(self):
     install_requires=[
         'pandas>=0.25.3',
         'pyhive[hive, presto]>=0.6.1',
-        'river>=1.5',  # Stored in nhds PyPi
+        'rivet>=1.6',
         'pandavro>=1.6'
     ],
     extras_require={

test/test_append_table.py

@@ -1,6 +1,6 @@
 import pytest
 
-import river as rv
+import rivet as rv
 
 from honeycomb import append_df_to_table
 

test/test_create_table.py

@@ -1,6 +1,6 @@
 import pytest
 
-import river as rv
+import rivet as rv
 
 from honeycomb.create_table.create_table_from_df import create_table_from_df