Update Featuretools Branch Name #1038

gsheni · 2020-06-29T18:23:54Z

Pull Request Description

Change default branch name from master to main

.github/workflows/release.yml

docs/source/conf.py

rwedge · 2020-06-29T21:17:53Z

release.md

@@ -28,12 +28,12 @@ Branches on the conda-forge featuretools repo are automatically built and the pa
    ```bash
    git remote add upstream https://github.com/conda-forge/featuretools-feedstock.git
    ```
-4. If you made the fork previously and its master branch is missing commits, update it with any changes from upstream


Unsure if we will be able to rename this branch since it is part of conda-forge, worth looking into

It seems that conda-forge defaults to master, and all the packages use master.

https://conda-forge.org/docs/maintainer/adding_pkgs.html

https://github.com/conda-forge

codecov · 2020-06-30T14:29:55Z

Codecov Report

Merging #1038 into main will decrease coverage by 0.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #1038      +/-   ##
==========================================
- Coverage   98.35%   98.33%   -0.02%     
==========================================
  Files         126      126              
  Lines       13052    13052              
==========================================
- Hits        12837    12835       -2     
- Misses        215      217       +2

Impacted Files	Coverage Δ
featuretools/synthesis/deep_feature_synthesis.py	`97.34% <0.00%> (-0.49%)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f779e3c...20b2e4e. Read the comment docs.

gsheni · 2020-06-30T14:38:09Z

README.md

@@ -88,7 +88,7 @@ Featuretools contains many [different types of built-in primitives](https://prim
 ## Demos
 **Predict Next Purchase**

-[Repository](https://github.com/Featuretools/predict_next_purchase/) | [Notebook](https://github.com/Featuretools/predict_next_purchase/blob/master/Tutorial.ipynb)
+[Repository](https://github.com/Featuretools/predict_next_purchase/) | [Notebook](https://github.com/Featuretools/predict_next_purchase/blob/main/Tutorial.ipynb)


Main Branch Added:
https://github.com/Featuretools/predict-next-purchase/tree/main

gsheni · 2020-06-30T14:39:50Z

docs/source/guides/performance.rst

@@ -113,9 +113,9 @@ When an entire dataset is not required to calculate the features for a given set

 An example of this approach can be seen in the `Predict Next Purchase demo notebook <https://github.com/featuretools/predict_next_purchase>`_. In this example, we partition data by customer and only load a fixed number of customers into memory at any given time. We implement this easily using `Dask <https://dask.pydata.org/>`_, which could also be used to scale the computation to a cluster of computers. A framework like `Spark <https://spark.apache.org/>`_ could be used similarly.

-An additional example of partitioning data to distribute on multiple cores or a cluster using Dask can be seen in the `Featuretools on Dask notebook <https://github.com/Featuretools/Automated-Manual-Comparison/blob/master/Loan%20Repayment/notebooks/Featuretools%20on%20Dask.ipynb>`_. This approach is detailed in the `Parallelizing Feature Engineering with Dask article <https://medium.com/feature-labs-engineering/scaling-featuretools-with-dask-ce46f9774c7d>`_ on the Feature Labs engineering blog. Dask allows for simple scaling to multiple cores on a single computer or multiple machines on a cluster.
+An additional example of partitioning data to distribute on multiple cores or a cluster using Dask can be seen in the `Featuretools on Dask notebook <https://github.com/Featuretools/Automated-Manual-Comparison/blob/main/Loan%20Repayment/notebooks/Featuretools%20on%20Dask.ipynb>`_. This approach is detailed in the `Parallelizing Feature Engineering with Dask article <https://medium.com/feature-labs-engineering/scaling-featuretools-with-dask-ce46f9774c7d>`_ on the Feature Labs engineering blog. Dask allows for simple scaling to multiple cores on a single computer or multiple machines on a cluster.


Main Branch Added:
https://github.com/Featuretools/Automated-Manual-Comparison/tree/main

gsheni · 2020-06-30T14:41:57Z

docs/source/guides/performance.rst


-For a similar partition and distribute implementation using Apache Spark with PySpark, refer to the `Feature Engineering on Spark notebook <https://github.com/Featuretools/predicting-customer-churn/blob/master/churn/4.%20Feature%20Engineering%20on%20Spark.ipynb>`_. This implementation shows how to carry out feature engineering on a cluster of EC2 instances using Spark as the distributed framework. A write-up of this approach is described in the `Featuretools on Spark article <https://blog.featurelabs.com/featuretools-on-spark-2/>`_ on the Feature Labs engineering blog.
+For a similar partition and distribute implementation using Apache Spark with PySpark, refer to the `Feature Engineering on Spark notebook <https://github.com/Featuretools/predicting-customer-churn/blob/main/churn/4.%20Feature%20Engineering%20on%20Spark.ipynb>`_. This implementation shows how to carry out feature engineering on a cluster of EC2 instances using Spark as the distributed framework. A write-up of this approach is described in the `Featuretools on Spark article <https://blog.featurelabs.com/featuretools-on-spark-2/>`_ on the Feature Labs engineering blog.


Main Branch Added:
https://github.com/Featuretools/predict-customer-churn/tree/main/churn

gsheni · 2020-06-30T14:44:28Z

.github/workflows/release.yml

    - name: PyPI Upload
-      uses: FeatureLabs/gh-action-pypi-upload@master
+      uses: FeatureLabs/gh-action-pypi-upload@main


Main Branch added:
https://github.com/FeatureLabs/gh-action-pypi-upload/tree/main

Perhaps we should switch to using tagged releases of this action so that the branch name isn't even a factor

update branch name

39a95d7

gsheni requested a review from rwedge June 29, 2020 18:23

gsheni self-assigned this Jun 29, 2020

add to changelog

c1a13c0

rwedge reviewed Jun 29, 2020

View reviewed changes

fix based on feedback

5b1fcca

gsheni commented Jun 30, 2020

View reviewed changes

fix predict churn link

e6c7d3b

gsheni commented Jun 30, 2020

View reviewed changes

gsheni and others added 6 commits June 30, 2020 16:50

Merge branch 'master' into update_ft_branch

071cf8d

Merge branch 'master' into update_ft_branch

7efbaa7

Update conf.py

5ce6dc9

add extra line to changelog

435be81

Update release.yml

59ef6a2

Update changelog.rst

20b2e4e

rwedge changed the base branch from master to main July 1, 2020 19:50

rwedge mentioned this pull request Jul 1, 2020

make 'main' the default branch of the repo #1042

Closed

gsheni merged commit 45998e8 into main Jul 2, 2020
2 of 3 checks passed

gsheni deleted the update_ft_branch branch July 2, 2020 18:24

rwedge mentioned this pull request Jul 31, 2020

v0.18.0 #1098

Merged

Update Featuretools Branch Name #1038

Update Featuretools Branch Name #1038

gsheni commented Jun 29, 2020

rwedge Jun 29, 2020

gsheni Jun 30, 2020 •

edited

codecov bot commented Jun 30, 2020 •

edited

gsheni Jun 30, 2020

gsheni Jun 30, 2020

gsheni Jun 30, 2020

gsheni Jun 30, 2020

rwedge Jul 1, 2020


		For a similar partition and distribute implementation using Apache Spark with PySpark, refer to the `Feature Engineering on Spark notebook <https://github.com/Featuretools/predicting-customer-churn/blob/master/churn/4.%20Feature%20Engineering%20on%20Spark.ipynb>`_. This implementation shows how to carry out feature engineering on a cluster of EC2 instances using Spark as the distributed framework. A write-up of this approach is described in the `Featuretools on Spark article <https://blog.featurelabs.com/featuretools-on-spark-2/>`_ on the Feature Labs engineering blog.
		For a similar partition and distribute implementation using Apache Spark with PySpark, refer to the `Feature Engineering on Spark notebook <https://github.com/Featuretools/predicting-customer-churn/blob/main/churn/4.%20Feature%20Engineering%20on%20Spark.ipynb>`_. This implementation shows how to carry out feature engineering on a cluster of EC2 instances using Spark as the distributed framework. A write-up of this approach is described in the `Featuretools on Spark article <https://blog.featurelabs.com/featuretools-on-spark-2/>`_ on the Feature Labs engineering blog.

Update Featuretools Branch Name #1038

Update Featuretools Branch Name #1038

Conversation

gsheni commented Jun 29, 2020

Pull Request Description

rwedge Jun 29, 2020

Choose a reason for hiding this comment

gsheni Jun 30, 2020 • edited

Choose a reason for hiding this comment

codecov bot commented Jun 30, 2020 • edited

Codecov Report

gsheni Jun 30, 2020

Choose a reason for hiding this comment

gsheni Jun 30, 2020

Choose a reason for hiding this comment

gsheni Jun 30, 2020

Choose a reason for hiding this comment

gsheni Jun 30, 2020

Choose a reason for hiding this comment

rwedge Jul 1, 2020

Choose a reason for hiding this comment

gsheni Jun 30, 2020 •

edited

codecov bot commented Jun 30, 2020 •

edited