diff --git a/.ci/dffml-install.sh b/.ci/dffml-install.sh index 68d75894a2..72a961a8bb 100755 --- a/.ci/dffml-install.sh +++ b/.ci/dffml-install.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -xe -if [ "x${DFFML_RELEASE}" == "xmaster" ]; then +if [ "x${DFFML_RELEASE}" == "xmain" ]; then pip install -e .[dev] dffml service dev install elif [ "x${DFFML_RELEASE}" == "xlatest" ]; then diff --git a/.ci/run.sh b/.ci/run.sh index 6572b4bb1f..f4298397f7 100755 --- a/.ci/run.sh +++ b/.ci/run.sh @@ -171,7 +171,7 @@ function run_changelog() { exit 0 fi # Ensure the number of lines added in the changelog is not 0 - added_to_changelog=$(git diff origin/master --numstat -- CHANGELOG.md \ + added_to_changelog=$(git diff origin/main --numstat -- CHANGELOG.md \ | awk '{print $1}') if [ "x$added_to_changelog" == "x" ] || [ "$added_to_changelog" -eq 0 ]; then echo "No changes to CHANGELOG.md" >&2 @@ -206,7 +206,7 @@ function run_style() { function run_commit(){ BRANCH="$(echo $GITHUB_REF | cut -d'/' -f 3)" echo "On Branch: ${BRANCH}" - if [[ "$BRANCH" != "master" ]]; then + if [[ "$BRANCH" != "main" ]]; then dffml service dev lint commits fi } @@ -245,13 +245,13 @@ function run_docs() { exit 1 fi - # Make master docs - master_docs="$(mktemp -d)" - TEMP_DIRS+=("${master_docs}") + # Make main docs + main_docs="$(mktemp -d)" + TEMP_DIRS+=("${main_docs}") rm -rf pages dffml service dev docs || ./scripts/docs.sh - mv pages "${master_docs}/html" + mv pages "${main_docs}/html" # Make last release docs release_docs="$(mktemp -d)" @@ -276,14 +276,14 @@ function run_docs() { "${release_docs}/old-gh-pages-branch" mv "${release_docs}/old-gh-pages-branch/.git" "${release_docs}/html/" - mv "${master_docs}/html" "${release_docs}/html/master" + mv "${main_docs}/html" "${release_docs}/html/main" # Make webui git clone https://github.com/intel/dffml -b webui "${release_docs}/webui" cd "${release_docs}/webui/service/webui/webui" yarn install yarn build - mv build/ "${release_docs}/html/master/webui" + mv build/ "${release_docs}/html/main/webui" cd "${release_docs}/html" @@ -293,8 +293,8 @@ function run_docs() { git add -A git commit -sam "docs: $(date)" - # Don't push docs unless we're running on master - if [ "x${GITHUB_ACTIONS}" == "xtrue" ] && [ "x${GITHUB_REF}" != "xrefs/heads/master" ]; then + # Don't push docs unless we're running on main + if [ "x${GITHUB_ACTIONS}" == "xtrue" ] && [ "x${GITHUB_REF}" != "xrefs/heads/main" ]; then return fi @@ -312,7 +312,7 @@ function run_docs() { cd - git reset --hard HEAD - git checkout master + git checkout main } function run_lines() { @@ -320,7 +320,7 @@ function run_lines() { } function run_container() { - docker build --build-arg DFFML_RELEASE=master -t intelotc/dffml . + docker build --build-arg DFFML_RELEASE=main -t intelotc/dffml . docker run --rm intelotc/dffml version docker run --rm intelotc/dffml service dev entrypoints list dffml.model } diff --git a/.github/ISSUE_TEMPLATE/gsoc_project_idea.md b/.github/ISSUE_TEMPLATE/gsoc_project_idea.md index 03134ed72c..44b4db55ad 100644 --- a/.github/ISSUE_TEMPLATE/gsoc_project_idea.md +++ b/.github/ISSUE_TEMPLATE/gsoc_project_idea.md @@ -60,20 +60,20 @@ Intermediate/Hard ## Related Readings -- https://github.com/intel/dffml/blob/master/docs/contributing/gsoc/2021.md +- https://github.com/intel/dffml/blob/main/docs/contributing/gsoc/2021.md - https://scikit-learn.org/stable/model_selection.html#model-selection - https://www.automl.org/automl/ ## Getting Started - Read the contributing guidelines - - https://intel.github.io/dffml/master/contributing/index.html + - https://intel.github.io/dffml/main/contributing/index.html - Go through the quickstart - - https://intel.github.io/dffml/master/quickstart/model.html + - https://intel.github.io/dffml/main/quickstart/model.html - Go trough the model tutorials - - https://intel.github.io/dffml/master/tutorials/models/ + - https://intel.github.io/dffml/main/tutorials/models/ - Go through the model plugins - - https://intel.github.io/dffml/master/plugins/dffml_model.html + - https://intel.github.io/dffml/main/plugins/dffml_model.html - You don't need to go through all of them. Just get a feel for running a few ## Potential Mentors diff --git a/CHANGELOG.md b/CHANGELOG.md index 03881e63e4..5548194643 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -317,7 +317,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `allowempty` added to source config parameters. - Quickstart document to show how to use models from Python. - The latest release of the documentation now includes a link to the - documentation for the master branch (on GitHub pages). + documentation for the main branch (on GitHub pages). - Virtual environment, GitPod, and Docker development environment setup notes to the CONTRIBUTING.md file. - Changelog now included in documentation website. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56d53b5024..82090cc7a7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,3 @@ # Contributing -Please see the [contributing docs page](https://intel.github.io/dffml/master/contributing/). +Please see the [contributing docs page](https://intel.github.io/dffml/main/contributing/). diff --git a/Dockerfile b/Dockerfile index 5b31d4571e..5f6596c3b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -87,8 +87,8 @@ RUN apt-get update && \ # # Here we install DFFML and all the plugins -# The release of dffml we're using, latest is the latest PyPi release, master is -# the master branch +# The release of dffml we're using, latest is the latest PyPi release, main is +# the main branch ARG DFFML_RELEASE=latest ENV DFFML_RELEASE ${DFFML_RELEASE} diff --git a/README.md b/README.md index fdccb51060..205324c850 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -![Logo-dark](https://raw.githubusercontent.com/intel/dffml/master/docs/images/logo-darkmode.svg#gh-dark-mode-only) -![Logo-light](https://raw.githubusercontent.com/intel/dffml/master/docs/images/logo-lightmode.svg#gh-light-mode-only) -[![Actions Status](https://github.com/intel/dffml/workflows/Tests/badge.svg?branch=master&event=push)](https://github.com/intel/dffml/actions) +![Logo-dark](https://raw.githubusercontent.com/intel/dffml/main/docs/images/logo-darkmode.svg#gh-dark-mode-only) +![Logo-light](https://raw.githubusercontent.com/intel/dffml/main/docs/images/logo-lightmode.svg#gh-light-mode-only) +[![Actions Status](https://github.com/intel/dffml/workflows/Tests/badge.svg?branch=main&event=push)](https://github.com/intel/dffml/actions) [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/intel/dffml) -[![codecov](https://codecov.io/gh/intel/dffml/branch/master/graph/badge.svg)](https://codecov.io/gh/intel/dffml) +[![codecov](https://codecov.io/gh/intel/dffml/branch/main/graph/badge.svg)](https://codecov.io/gh/intel/dffml) [![CII](https://bestpractices.coreinfrastructure.org/projects/2594/badge)](https://bestpractices.coreinfrastructure.org/projects/2594) [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/dffml/community) [![PyPI version](https://img.shields.io/pypi/v/dffml.svg)](https://pypi.org/project/dffml) @@ -21,12 +21,12 @@ We broadly have two types of audience here, one is Citizen Data Scientists and M Documentation for the latest release is hosted at https://intel.github.io/dffml/ -Documentation for the master branch is hosted at -https://intel.github.io/dffml/master/index.html +Documentation for the main branch is hosted at +https://intel.github.io/dffml/main/index.html ## Contributing -The [contributing page](https://intel.github.io/dffml/master/contributing/index.html) +The [contributing page](https://intel.github.io/dffml/main/contributing/index.html) will guide you through getting setup and contributing to DFFML. ## Help diff --git a/configloader/image/setup_common.py b/configloader/image/setup_common.py index 937183a4a6..6ba8014806 100644 --- a/configloader/image/setup_common.py +++ b/configloader/image/setup_common.py @@ -39,7 +39,7 @@ author_email=AUTHOR_EMAIL, maintainer=AUTHOR_NAME, maintainer_email=AUTHOR_EMAIL, - url=f"https://github.com/dffml/blob/master/configloader/image/README.md", + url=f"https://github.com/dffml/blob/main/configloader/image/README.md", license="MIT", keywords=["dffml"], classifiers=[ diff --git a/configloader/yaml/setup_common.py b/configloader/yaml/setup_common.py index 3354152432..d9622d78db 100644 --- a/configloader/yaml/setup_common.py +++ b/configloader/yaml/setup_common.py @@ -39,7 +39,7 @@ author_email=AUTHOR_EMAIL, maintainer=AUTHOR_NAME, maintainer_email=AUTHOR_EMAIL, - url="https://github.com/intel/dffml/blob/master/configloader/yaml/README.md", + url="https://github.com/intel/dffml/blob/main/configloader/yaml/README.md", license="MIT", keywords=["dffml"], classifiers=[ diff --git a/dffml/service/dev.py b/dffml/service/dev.py index 1805d1abcd..4efa0c40bf 100644 --- a/dffml/service/dev.py +++ b/dffml/service/dev.py @@ -877,8 +877,8 @@ async def _get_file_mutations(self): return mutations async def _get_relevant_commits(self): - #! This needs to change when master is renamed to main. - cmd = ["git", "cherry", "-v", "origin/master"] + #! This needs to change when main is renamed to main. + cmd = ["git", "cherry", "-v", "origin/main"] commits = await get_cmd_output(cmd) commits_list = [ " ".join(line.split()[2:]) for line in commits.split("\n") diff --git a/docs/conf.py b/docs/conf.py index a31b24ea43..a1602cb5f8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -88,7 +88,7 @@ nbsphinx_prolog = r""" {% set docname = env.doc2path(env.docname, base=None) %} {% if "." not in env.config.release %} - {% set nb_version = "master/" %} + {% set nb_version = "main/" %} {% endif %} .. image:: ../../images/Download-.ipynb-button.svg @@ -108,7 +108,7 @@ html_context = { "github_user": "intel", "github_repo": "dffml", - "github_version": "master", + "github_version": "main", "conf_py_path": "/docs/", "display_github": True, } diff --git a/docs/contributing/dev_env.rst b/docs/contributing/dev_env.rst index 5347dde751..37b2516066 100644 --- a/docs/contributing/dev_env.rst +++ b/docs/contributing/dev_env.rst @@ -32,17 +32,17 @@ development mode. There are two versions of this documentation. - The version you want is https://intel.github.io/dffml/master/ if you are + The version you want is https://intel.github.io/dffml/main/ if you are working on DFFML itself. When working from the Git version of DFFML, the documentation URL you're - looking at should say ``/master/`` in the URL. The URL you are currently on - should be https://intel.github.io/dffml/master/contributing/dev_env.html + looking at should say ``/main/`` in the URL. The URL you are currently on + should be https://intel.github.io/dffml/main/contributing/dev_env.html - This docs without ``/master/`` in the URL are built from the latest release. + This docs without ``/main/`` in the URL are built from the latest release. - The docs with ``/master/`` in the URL are built from the *master* branch. - The master branch is what you get when you clone the Git repo, which we're + The docs with ``/main/`` in the URL are built from the *main* branch. + The main branch is what you get when you clone the Git repo, which we're about to do. Installing to your home directory will reduce permissions issues. To do diff --git a/docs/contributing/git.rst b/docs/contributing/git.rst index 437ce9ad83..84ea9f7d4e 100644 --- a/docs/contributing/git.rst +++ b/docs/contributing/git.rst @@ -23,7 +23,7 @@ to do your work on. .. code-block:: console $ git fetch origin - $ git checkout -b my_new_thing origin/master + $ git checkout -b my_new_thing origin/main You need to have your own version of DFFML to track your work. Log in to your Github account and go to `DFFML `_ repository. @@ -96,7 +96,7 @@ review your work or help you figure out what might be going wrong or how you could solve an issue your stuck on. Before you are get help, a review, or a final review, make sure to fetch the -latest changes from the master branch and ``merge`` or ``rebase`` them into your +latest changes from the main branch and ``merge`` or ``rebase`` them into your branch. When you are ready for final review, remove the ``WIP:`` prefix or draft status. @@ -140,13 +140,13 @@ is okay. +--------------+---------------------------------------------------------------+ | LINES | A python file was changed that has specific lines referenced | | | by a ``.rst`` file. If one of the files is not true, its | -| | because you need to merge or rebase origin/master into your | +| | because you need to merge or rebase origin/main into your | | | branch. | +--------------+---------------------------------------------------------------+ For the tests in the various plugins: -- You need to grab the latests changes from the master branch. Maybe you need to +- You need to grab the latests changes from the main branch. Maybe you need to adapt to them, for example if something got renamed, check the changelog. - You need to add any dependencies (``pip install ...``) you need to the diff --git a/docs/contributing/gsoc/2019.md b/docs/contributing/gsoc/2019.md index 60ca830eee..3de4731733 100644 --- a/docs/contributing/gsoc/2019.md +++ b/docs/contributing/gsoc/2019.md @@ -56,13 +56,13 @@ We currently have three project ideas, you can read about them and discuss in th If you've got a brilliant idea you'd like to propose, please make a new issue with the `gsoc` and `project` tags to discuss it! Students are also welcome to add "stretch goal" ideas to their application if they'd like to start with one of our ideas but have a few extra feature ideas of their own they'd like to work on at the end of the summer if everything stays on schedule. [Take a look at the current open issues to see what users want](https://github.com/intel/dffml/issues). Issues which we've talked to someone who would use this as a part of their product or service for their business have the label `customer`. Those are cool because we know they will get used! ## Getting Started -- Follow the [README](https://github.com/intel/dffml/blob/master/README.md) and make sure you can run the tensorflow and git examples, Looking at the [Travis CI](https://travis-ci.org/intel/dffml) may come in handy here. -- [Run the tests](https://github.com/intel/dffml/tree/master/tests). DFFML has unit tests which are at about 90% coverage (amount of lines of code tested) for the main library, the [Git features](https://github.com/intel/dffml/tree/master/feature/git/tests), and the [Tensorflow model](https://github.com/intel/dffml/tree/master/model/tensorflow/tests). Make sure you know how to run them, and if you've never done Python unittests before you might want to [read up on python's unittest library](https://docs.python.org/3/library/unittest.html). Figure out how to run a single test! Running one test instead of all of them will speed up your workflow when you are writing your tests! +- Follow the [README](https://github.com/intel/dffml/blob/main/README.md) and make sure you can run the tensorflow and git examples, Looking at the [Travis CI](https://travis-ci.org/intel/dffml) may come in handy here. +- [Run the tests](https://github.com/intel/dffml/tree/main/tests). DFFML has unit tests which are at about 90% coverage (amount of lines of code tested) for the main library, the [Git features](https://github.com/intel/dffml/tree/main/feature/git/tests), and the [Tensorflow model](https://github.com/intel/dffml/tree/main/model/tensorflow/tests). Make sure you know how to run them, and if you've never done Python unittests before you might want to [read up on python's unittest library](https://docs.python.org/3/library/unittest.html). Figure out how to run a single test! Running one test instead of all of them will speed up your workflow when you are writing your tests! - Make your first contribution! - Work on anything labeled [good first issue](https://github.com/intel/dffml/labels/good%20first%20issue). - Help us increase the test coverage in any of the packages (check out the python package `coverage` to learn how to do this). - - Write a [new feature](https://github.com/intel/dffml/issues/13)! Features can do anything you want, they generate some data based on a unique key, think of them like a scraper, see the [new feature guide](https://github.com/intel/dffml/tree/master/docs/tutorial/FEATURE.md) for more info. Make sure to include tests! - - Write a [new model](https://github.com/intel/dffml/issues/29)! Models are wrappers around any machine learning implementation or library, see the [new model guide](https://github.com/intel/dffml/tree/master/docs/tutorial/MODEL.md) for more info. Make sure to include tests! + - Write a [new feature](https://github.com/intel/dffml/issues/13)! Features can do anything you want, they generate some data based on a unique key, think of them like a scraper, see the [new feature guide](https://github.com/intel/dffml/tree/main/docs/tutorial/FEATURE.md) for more info. Make sure to include tests! + - Write a [new model](https://github.com/intel/dffml/issues/29)! Models are wrappers around any machine learning implementation or library, see the [new model guide](https://github.com/intel/dffml/tree/main/docs/tutorial/MODEL.md) for more info. Make sure to include tests! ## Writing your GSoC application Instructions on [How to apply](http://python-gsoc.org/#apply) can be found on the Python GSoC website. diff --git a/docs/contributing/gsoc/2021/archive_storage.md b/docs/contributing/gsoc/2021/archive_storage.md index 69b2db3b93..db2f1c58e6 100644 --- a/docs/contributing/gsoc/2021/archive_storage.md +++ b/docs/contributing/gsoc/2021/archive_storage.md @@ -21,18 +21,18 @@ Beginner/Intermediate ## Related Readings -- https://intel.github.io/dffml/master/contributing/gsoc/2021/ +- https://intel.github.io/dffml/main/contributing/gsoc/2021/ ## Getting Started - Read the contributing guidelines - - https://intel.github.io/dffml/master/contributing/index.html + - https://intel.github.io/dffml/main/contributing/index.html - Go through the quickstart - - https://intel.github.io/dffml/master/quickstart/model.html + - https://intel.github.io/dffml/main/quickstart/model.html - Go trough the model tutorials - - https://intel.github.io/dffml/master/tutorials/models/ + - https://intel.github.io/dffml/main/tutorials/models/ - Go through the model plugins - - https://intel.github.io/dffml/master/plugins/dffml_model.html + - https://intel.github.io/dffml/main/plugins/dffml_model.html - Start programming to understand better what will need to happen. The following is a rough guide meant to give you some activities that will help you better understand what needs to be done so you can write a more complete proposal. diff --git a/docs/contributing/gsoc/2021/automl.md b/docs/contributing/gsoc/2021/automl.md index 14ed5c7064..85c50f43f8 100644 --- a/docs/contributing/gsoc/2021/automl.md +++ b/docs/contributing/gsoc/2021/automl.md @@ -47,20 +47,20 @@ Intermediate/Hard ## Related Readings -- https://github.com/intel/dffml/blob/master/docs/contributing/gsoc/2021.md +- https://github.com/intel/dffml/blob/main/docs/contributing/gsoc/2021.md - https://scikit-learn.org/stable/model_selection.html#model-selection - https://www.automl.org/automl/ ## Getting Started - Read the contributing guidelines - - https://intel.github.io/dffml/master/contributing/index.html + - https://intel.github.io/dffml/main/contributing/index.html - Go through the quickstart - - https://intel.github.io/dffml/master/quickstart/model.html + - https://intel.github.io/dffml/main/quickstart/model.html - Go trough the model tutorials - - https://intel.github.io/dffml/master/tutorials/models/ + - https://intel.github.io/dffml/main/tutorials/models/ - Go through the model plugins - - https://intel.github.io/dffml/master/plugins/dffml_model.html + - https://intel.github.io/dffml/main/plugins/dffml_model.html ## Potential Mentors diff --git a/docs/contributing/gsoc/2021/cleanup_dataflows.md b/docs/contributing/gsoc/2021/cleanup_dataflows.md index 46f6d624bf..0964db097d 100644 --- a/docs/contributing/gsoc/2021/cleanup_dataflows.md +++ b/docs/contributing/gsoc/2021/cleanup_dataflows.md @@ -26,30 +26,30 @@ Intermediate ## Related Readings -- https://intel.github.io/dffml/master/contributing/gsoc/2021/index.html +- https://intel.github.io/dffml/main/contributing/gsoc/2021/index.html - We have some preprocessing operations for images and NLP already. Some of them leverage scikit - - https://intel.github.io/dffml/master/plugins/dffml_operation.html#dffml-operations-nlp - - https://intel.github.io/dffml/master/plugins/dffml_operation.html#dffml-operations-image + - https://intel.github.io/dffml/main/plugins/dffml_operation.html#dffml-operations-nlp + - https://intel.github.io/dffml/main/plugins/dffml_operation.html#dffml-operations-image - https://scikit-learn.org/stable/modules/preprocessing.html#preprocessing ## Getting Started - Read the contributing guidelines - - https://intel.github.io/dffml/master/contributing/index.html + - https://intel.github.io/dffml/main/contributing/index.html - Go through the quickstart - - https://intel.github.io/dffml/master/quickstart/model.html + - https://intel.github.io/dffml/main/quickstart/model.html - Go trough the model tutorials - - https://intel.github.io/dffml/master/tutorials/models/ + - https://intel.github.io/dffml/main/tutorials/models/ - Go through the model plugins - - https://intel.github.io/dffml/master/plugins/dffml_model.html + - https://intel.github.io/dffml/main/plugins/dffml_model.html - Go through the data flow related docs and tutorials - - https://intel.github.io/dffml/master/tutorials/dataflows/index.html - - https://intel.github.io/dffml/master/examples/integration.html - - https://intel.github.io/dffml/master/examples/shouldi.html - - https://intel.github.io/dffml/master/examples/dataflows.html - - https://intel.github.io/dffml/master/examples/mnist.html - - https://intel.github.io/dffml/master/examples/flower17/flower17.html - - https://intel.github.io/dffml/master/examples/webhook/index.html + - https://intel.github.io/dffml/main/tutorials/dataflows/index.html + - https://intel.github.io/dffml/main/examples/integration.html + - https://intel.github.io/dffml/main/examples/shouldi.html + - https://intel.github.io/dffml/main/examples/dataflows.html + - https://intel.github.io/dffml/main/examples/mnist.html + - https://intel.github.io/dffml/main/examples/flower17/flower17.html + - https://intel.github.io/dffml/main/examples/webhook/index.html - Find a few public datasets that are in need of cleanup - Make sure there are a mix of data types, floats, ints, boolean values. - Make sure that across all the examples you find, there are at least 4 diff --git a/docs/contributing/gsoc/2021/dataflow_event_types.md b/docs/contributing/gsoc/2021/dataflow_event_types.md index 9059f9dcf2..bfbfd19917 100644 --- a/docs/contributing/gsoc/2021/dataflow_event_types.md +++ b/docs/contributing/gsoc/2021/dataflow_event_types.md @@ -49,25 +49,25 @@ Intermediate/Hard ## Related Readings -- https://intel.github.io/dffml/master/contributing/gsoc/2021/index.html +- https://intel.github.io/dffml/main/contributing/gsoc/2021/index.html ## Getting Started - Read the contributing guidelines - - https://intel.github.io/dffml/master/contributing/index.html + - https://intel.github.io/dffml/main/contributing/index.html - Go through the quickstart - - https://intel.github.io/dffml/master/quickstart/model.html + - https://intel.github.io/dffml/main/quickstart/model.html - Go through the data flow related docs and tutorials - - https://intel.github.io/dffml/master/tutorials/dataflows/index.html - - https://intel.github.io/dffml/master/examples/integration.html - - https://intel.github.io/dffml/master/examples/shouldi.html - - https://intel.github.io/dffml/master/examples/dataflows.html - - https://intel.github.io/dffml/master/examples/mnist.html - - https://intel.github.io/dffml/master/examples/flower17/flower17.html - - https://intel.github.io/dffml/master/examples/webhook/index.html + - https://intel.github.io/dffml/main/tutorials/dataflows/index.html + - https://intel.github.io/dffml/main/examples/integration.html + - https://intel.github.io/dffml/main/examples/shouldi.html + - https://intel.github.io/dffml/main/examples/dataflows.html + - https://intel.github.io/dffml/main/examples/mnist.html + - https://intel.github.io/dffml/main/examples/flower17/flower17.html + - https://intel.github.io/dffml/main/examples/webhook/index.html - Read about what data flows are and how they work - - https://intel.github.io/dffml/master/concepts/index.html#dataflows - - https://intel.github.io/dffml/master/concepts/dataflow.html + - https://intel.github.io/dffml/main/concepts/index.html#dataflows + - https://intel.github.io/dffml/main/concepts/dataflow.html - Come up with a basic example where the user will see inputs moving through the network. - Make it simple and include a few operations. diff --git a/docs/contributing/gsoc/2021/index.rst b/docs/contributing/gsoc/2021/index.rst index 44f3df2fc6..17f46d16f0 100644 --- a/docs/contributing/gsoc/2021/index.rst +++ b/docs/contributing/gsoc/2021/index.rst @@ -17,7 +17,7 @@ implementations in the same way. DFFML is also a tool for dataset generation. DFFML ues directed graphs to generate and modify datasets. -Read more on the about page: https://intel.github.io/dffml/master/about.html +Read more on the about page: https://intel.github.io/dffml/main/about.html Project Ideas ------------- @@ -53,7 +53,7 @@ Getting Started - Run the examples for the various models found on the model plugins page -- `Run the tests `_. DFFML has +- `Run the tests `_. DFFML has unit tests and we track coverage (amount of lines of code tested). Make sure you know how to run them, and if you've never done Python unittests before you might want to diff --git a/docs/contributing/gsoc/2022/automl.md b/docs/contributing/gsoc/2022/automl.md index c6ac0f70f1..d15b49d28d 100644 --- a/docs/contributing/gsoc/2022/automl.md +++ b/docs/contributing/gsoc/2022/automl.md @@ -51,20 +51,20 @@ Intermediate/Hard ## Related Readings -- https://github.com/intel/dffml/blob/master/docs/contributing/gsoc/2022/ +- https://github.com/intel/dffml/blob/main/docs/contributing/gsoc/2022/ - https://scikit-learn.org/stable/model_selection.html#model-selection - https://www.automl.org/automl/ ## Getting Started - Read the contributing guidelines - - https://intel.github.io/dffml/master/contributing/index.html + - https://intel.github.io/dffml/main/contributing/index.html - Go through the quickstart - - https://intel.github.io/dffml/master/quickstart/model.html + - https://intel.github.io/dffml/main/quickstart/model.html - Go trough the model tutorials - - https://intel.github.io/dffml/master/tutorials/models/ + - https://intel.github.io/dffml/main/tutorials/models/ - Go through the model plugins - - https://intel.github.io/dffml/master/plugins/dffml_model.html + - https://intel.github.io/dffml/main/plugins/dffml_model.html ## Potential Mentors diff --git a/docs/contributing/gsoc/2022/dataflow_event_types.md b/docs/contributing/gsoc/2022/dataflow_event_types.md index 1421c65aa0..e684f1681c 100644 --- a/docs/contributing/gsoc/2022/dataflow_event_types.md +++ b/docs/contributing/gsoc/2022/dataflow_event_types.md @@ -53,25 +53,25 @@ Intermediate/Hard ## Related Readings -- https://intel.github.io/dffml/master/contributing/gsoc/2022/index.html +- https://intel.github.io/dffml/main/contributing/gsoc/2022/index.html ## Getting Started - Read the contributing guidelines - - https://intel.github.io/dffml/master/contributing/index.html + - https://intel.github.io/dffml/main/contributing/index.html - Go through the quickstart - - https://intel.github.io/dffml/master/quickstart/model.html + - https://intel.github.io/dffml/main/quickstart/model.html - Go through the data flow related docs and tutorials - - https://intel.github.io/dffml/master/tutorials/dataflows/index.html - - https://intel.github.io/dffml/master/examples/integration.html - - https://intel.github.io/dffml/master/examples/shouldi.html - - https://intel.github.io/dffml/master/examples/dataflows.html - - https://intel.github.io/dffml/master/examples/mnist.html - - https://intel.github.io/dffml/master/examples/flower17/flower17.html - - https://intel.github.io/dffml/master/examples/webhook/index.html + - https://intel.github.io/dffml/main/tutorials/dataflows/index.html + - https://intel.github.io/dffml/main/examples/integration.html + - https://intel.github.io/dffml/main/examples/shouldi.html + - https://intel.github.io/dffml/main/examples/dataflows.html + - https://intel.github.io/dffml/main/examples/mnist.html + - https://intel.github.io/dffml/main/examples/flower17/flower17.html + - https://intel.github.io/dffml/main/examples/webhook/index.html - Read about what data flows are and how they work - - https://intel.github.io/dffml/master/concepts/index.html#dataflows - - https://intel.github.io/dffml/master/concepts/dataflow.html + - https://intel.github.io/dffml/main/concepts/index.html#dataflows + - https://intel.github.io/dffml/main/concepts/dataflow.html - Come up with a basic example where the user will see inputs moving through the network. - Make it simple and include a few operations. diff --git a/docs/contributing/gsoc/2022/forecasting.md b/docs/contributing/gsoc/2022/forecasting.md index c8e2d09497..5109404f1d 100644 --- a/docs/contributing/gsoc/2022/forecasting.md +++ b/docs/contributing/gsoc/2022/forecasting.md @@ -40,24 +40,24 @@ Beginner ## Related Readings - Related readings and links have also been added in the related issues mentioned above. -- https://intel.github.io/dffml/master/examples/data_cleanup/data_cleanup.html -- https://intel.github.io/dffml/master/examples/icecream_sales.html -- https://intel.github.io/dffml/master/examples/or_covid_data_by_county.html -- https://intel.github.io/dffml/master/api/source/dataset/base.html -- https://intel.github.io/dffml/master/api/source/dataset/iris.html +- https://intel.github.io/dffml/main/examples/data_cleanup/data_cleanup.html +- https://intel.github.io/dffml/main/examples/icecream_sales.html +- https://intel.github.io/dffml/main/examples/or_covid_data_by_county.html +- https://intel.github.io/dffml/main/api/source/dataset/base.html +- https://intel.github.io/dffml/main/api/source/dataset/iris.html ## Getting Started - Read the contributing guidelines - - https://intel.github.io/dffml/master/contributing/index.html + - https://intel.github.io/dffml/main/contributing/index.html - Go through the quickstart - - https://intel.github.io/dffml/master/quickstart/model.html + - https://intel.github.io/dffml/main/quickstart/model.html - Go through the model tutorials - - https://intel.github.io/dffml/master/tutorials/models/ + - https://intel.github.io/dffml/main/tutorials/models/ - Go through the model plugins - - https://intel.github.io/dffml/master/plugins/dffml_model.html + - https://intel.github.io/dffml/main/plugins/dffml_model.html - Go through Jupyter Notebook Examples (they also have video walkthroughs available) - - https://intel.github.io/dffml/master/examples/notebooks/index.html + - https://intel.github.io/dffml/main/examples/notebooks/index.html - You don't need to go through all of them. Just get a feel for running a few ## Potential Mentors diff --git a/docs/contributing/gsoc/2022/index.rst b/docs/contributing/gsoc/2022/index.rst index 0d09f50ca9..a580d5d390 100644 --- a/docs/contributing/gsoc/2022/index.rst +++ b/docs/contributing/gsoc/2022/index.rst @@ -25,35 +25,35 @@ implementations in the same way. DFFML is also a tool for dataset generation. DFFML ues directed graphs to generate and modify datasets. -Read more on the about page: https://intel.github.io/dffml/master/about.html +Read more on the about page: https://intel.github.io/dffml/main/about.html Project Ideas ------------- We currently have the following project ideas: -- `Save and Load Models to ONNX format `_ +- `Save and Load Models to ONNX format `_ - Allow for DFFML to save trained models in the Open Neural Network Exchange format. This will help users easily deploy models. - Begineer - 175 hours -- `Time-Series Forecasting and Anomaly Detection `_ +- `Time-Series Forecasting and Anomaly Detection `_ - Give users of DFFML forecasting capabilties. Allow them to predict the future! Work with time stamped data to train models and make predictions. - Begineer - 350 hours -- `Implementing AutoML `_ +- `Implementing AutoML `_ - Implement hyperparameter tuners, best model selection via grid search and or other means, automated feature engineering by modifying dataflows. - Intermediate to Difficult - 350 hours -- `Refactor of DataFlows to Include Event Type `_ +- `Refactor of DataFlows to Include Event Type `_ - Refactor the :py:func:`dffml.high_level.run` API (and others) to make running Data Flows as dynamic as their event based content. This will let us @@ -72,7 +72,7 @@ project before the end of the summer, and have more that you want to do. Getting Started --------------- -- Read the `Contributing `_ documentation. +- Read the `Contributing `_ documentation. - Get your development environment set up @@ -83,7 +83,7 @@ Getting Started - Run the examples for the various models found on the model plugins page -- `Run the tests `_. DFFML has +- `Run the tests `_. DFFML has unit tests and we track coverage (amount of lines of code tested). Make sure you know how to run them, and if you've never done Python unittests before you might want to @@ -112,13 +112,13 @@ Getting Started Models are wrappers around any machine learning implementation or library, see the `new model tutorials - `_ + `_ for more info. Make sure to include tests! - You could write a new operation to do something! Anything! Operations to grab weather and stock data have been suggested by people as good ideas. See the `Ice Cream Sales - `_ + `_ example. Writing your GSoC application diff --git a/docs/contributing/gsoc/2022/onnx_save_load.md b/docs/contributing/gsoc/2022/onnx_save_load.md index bf36828c72..ec2a21f4e7 100644 --- a/docs/contributing/gsoc/2022/onnx_save_load.md +++ b/docs/contributing/gsoc/2022/onnx_save_load.md @@ -31,7 +31,7 @@ Beginner ## Related Readings -- https://intel.github.io/dffml/master/contributing/gsoc/2022/ +- https://intel.github.io/dffml/main/contributing/gsoc/2022/ - https://github.com/onnx/tensorflow-onnx - https://github.com/onnx/tutorials/blob/master/tutorials/TensorflowToOnnx-1.ipynb - https://github.com/onnx/tutorials/blob/master/tutorials/OnnxTensorflowImport.ipynb @@ -42,21 +42,21 @@ Beginner ## Getting Started - Read the contributing guidelines - - https://intel.github.io/dffml/master/contributing/index.html + - https://intel.github.io/dffml/main/contributing/index.html - Go through the quickstart - - https://intel.github.io/dffml/master/quickstart/model.html + - https://intel.github.io/dffml/main/quickstart/model.html - Go trough the model tutorials - - https://intel.github.io/dffml/master/tutorials/models/ + - https://intel.github.io/dffml/main/tutorials/models/ - Go through the model plugins - - https://intel.github.io/dffml/master/plugins/dffml_model.html + - https://intel.github.io/dffml/main/plugins/dffml_model.html - Train a tensorflow model - - https://intel.github.io/dffml/master/tutorials/models/iris.html - - https://intel.github.io/dffml/master/examples/mnist.html + - https://intel.github.io/dffml/main/tutorials/models/iris.html + - https://intel.github.io/dffml/main/examples/mnist.html - Attempt exporting the tensorflow model - https://github.com/onnx/tensorflow-onnx - - https://github.com/onnx/tutorials/blob/master/tutorials/TensorflowToOnnx-1.ipynb + - https://github.com/onnx/tutorials/blob/main/tutorials/TensorflowToOnnx-1.ipynb - Attempt import of ONNX tensorflow model - - https://github.com/onnx/tutorials/blob/master/tutorials/OnnxTensorflowImport.ipynb + - https://github.com/onnx/tutorials/blob/main/tutorials/OnnxTensorflowImport.ipynb - Start programming to understand better what will need to happen. The following is a rough guide meant to give you some activities that will help you better understand what needs to be done so you can write a more complete proposal. diff --git a/docs/contributing/maintainers.rst b/docs/contributing/maintainers.rst index 40c5d54681..883bb89e63 100644 --- a/docs/contributing/maintainers.rst +++ b/docs/contributing/maintainers.rst @@ -50,11 +50,11 @@ Doing a Release - Push the new branch (if created) and the tag -- Switch to the master branch +- Switch to the main branch - Cherry pick the release commit from the new branch, but not the pinning commit -- Push the master branch +- Push the main branch .. code-block:: console @@ -66,6 +66,6 @@ Doing a Release $ git tag $(dffml service dev setuppy version dffml/version.py) $ git push -u origin N.N.x $ git push --tags - $ git checkout master + $ git checkout main $ git cherry-pick X.Y.Z~1 $ git push diff --git a/docs/examples/innersource/microservice.rst b/docs/examples/innersource/microservice.rst index 5da30dd7ca..47c3660533 100644 --- a/docs/examples/innersource/microservice.rst +++ b/docs/examples/innersource/microservice.rst @@ -253,7 +253,7 @@ items that you want evaluated. "extra": {}, "features": { "created_at": "2018-09-19T21:06:34Z", - "default_branch": "master", + "default_branch": "main", "description": "The easiest way to use Machine Learning. Mix and match underlying ML libraries and data set sources. Generate new datasets or modify existing ones with ease.", "forks_count": 118, "full_name": "intel/dffml", diff --git a/docs/examples/innersource/swportal.rst b/docs/examples/innersource/swportal.rst index d80d90f364..5cc17f366c 100644 --- a/docs/examples/innersource/swportal.rst +++ b/docs/examples/innersource/swportal.rst @@ -8,7 +8,7 @@ software development workflow that makes is easy for a large group of developers to collaborate quickly and effectively. All the code for this example project is located under the -`examples/innersource/swportal `_ +`examples/innersource/swportal `_ directory of the DFFML source code. History @@ -103,7 +103,7 @@ We have a number of constraints for this example. - The repos we are interested in displaying are all hosted in GitHub. We can find the information we need stored on the file system. (See the - `orgs `_ + `orgs `_ directory to see what this looks like). - The structure is such that GitHub orgs are directories. Each directory @@ -381,7 +381,7 @@ Try listing all the records in the new source to verify it works. ] }, "created_at": "2017-01-31T09:39:12Z", - "default_branch": "master", + "default_branch": "main", "description": "Earth is the third planet from the Sun and the home-world of humanity.", "forks_count": 331, "full_name": "Sol/earth", diff --git a/docs/examples/shouldi.rst b/docs/examples/shouldi.rst index ebf2a00324..7a2ea97c7d 100644 --- a/docs/examples/shouldi.rst +++ b/docs/examples/shouldi.rst @@ -155,7 +155,7 @@ Create a new package using the create script. .. note:: All the code for this example is located under the - `examples/shouldi `_ + `examples/shouldi `_ directory of the DFFML source code. Remove the example files as we won't be needing them diff --git a/docs/examples/webhook/deploy.rst b/docs/examples/webhook/deploy.rst index 568fc346b3..ed9e8c148d 100644 --- a/docs/examples/webhook/deploy.rst +++ b/docs/examples/webhook/deploy.rst @@ -10,7 +10,7 @@ we'll setup another HTTP service which waits on GitHub webhooks to rebuilt and d .. note:: All the code for this example is located under the - `examples/ffmpeg `_ + `examples/ffmpeg `_ directory of the DFFML source code. We'll be using additional plugins from dffml, ``dffml-config-yaml`` and ``dffml-http-service``. @@ -97,7 +97,7 @@ Now from another terminal, we can send post requests to the dataflow running at $ curl -v --request POST --data-binary @input.mp4 http://localhost:8080/ffmpeg -o output.gif You should replace ``input.mp4`` with path to your video file and ``output.gif`` to where you want the converted gif -to be output to. An example video is available `here `_ . +to be output to. An example video is available `here `_ . Deploying via container ======================= diff --git a/docs/index.rst b/docs/index.rst index 8c5e96bfa2..e999471fa4 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,10 +1,10 @@ Welcome to DFFML! ================= -.. image:: https://github.com/intel/dffml/workflows/Tests/badge.svg?branch=master&event=push +.. image:: https://github.com/intel/dffml/workflows/Tests/badge.svg?branch=main&event=push :target: https://github.com/intel/dffml/actions :alt: Test Status -.. image:: https://codecov.io/gh/intel/dffml/branch/master/graph/badge.svg +.. image:: https://codecov.io/gh/intel/dffml/branch/main/graph/badge.svg :target: https://codecov.io/gh/intel/dffml :alt: codecov .. image:: https://bestpractices.coreinfrastructure.org/projects/2594/badge @@ -33,8 +33,8 @@ Output: {'Years': 6, 'Expertise': 13, 'Trust': 0.7, 'Salary': 70.0} {'Years': 7, 'Expertise': 15, 'Trust': 0.8, 'Salary': 80.0} -This is the documentation for the latest release, documentation for the master -branch can be found `here `_. +This is the documentation for the latest release, documentation for the main +branch can be found `here
`_. .. toctree:: :glob: @@ -79,7 +79,7 @@ branch can be found `here `_. :caption: Community GitHub - Master Branch Docs + Master Branch Docs publications contact contributing/index diff --git a/docs/installation.rst b/docs/installation.rst index ad742ccba0..df645f6f85 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -130,7 +130,7 @@ Master Branch ------------- If you want to stay on the bleeding edge of bug fixes, etc. You can install from -the master branch. +the main branch. .. tabs:: @@ -139,13 +139,13 @@ the master branch. .. code-block:: console :test: - $ python -m pip install -U "https://github.com/intel/dffml/archive/master.zip#egg=dffml" + $ python -m pip install -U "https://github.com/intel/dffml/archive/main.zip#egg=dffml" .. group-tab:: Windows .. code-block:: console - (.venv) C:\Users\username> python -m pip install -U "https://github.com/intel/dffml/archive/master.zip#egg=dffml" + (.venv) C:\Users\username> python -m pip install -U "https://github.com/intel/dffml/archive/main.zip#egg=dffml" You can also install the bleeding edge version of any plugin. To get the subdirectory you should use, take the package name on PyPi and remove ``dffml-`` @@ -158,19 +158,19 @@ and replace ``-`` with ``/``. .. code-block:: console :test: - $ python -m pip install -U "https://github.com/intel/dffml/archive/master.zip#egg=dffml" \ - "https://github.com/intel/dffml/archive/master.zip#egg=dffml-feature-git&subdirectory=feature/git" + $ python -m pip install -U "https://github.com/intel/dffml/archive/main.zip#egg=dffml" \ + "https://github.com/intel/dffml/archive/main.zip#egg=dffml-feature-git&subdirectory=feature/git" .. group-tab:: Windows .. code-block:: console - (.venv) C:\Users\username> python -m pip install -U "https://github.com/intel/dffml/archive/master.zip#egg=dffml" ^ - "https://github.com/intel/dffml/archive/master.zip#egg=dffml-feature-git&subdirectory=feature/git" + (.venv) C:\Users\username> python -m pip install -U "https://github.com/intel/dffml/archive/main.zip#egg=dffml" ^ + "https://github.com/intel/dffml/archive/main.zip#egg=dffml-feature-git&subdirectory=feature/git" There's an online IDE based on Theia (similar to VS Code) called GitPod that gives you a setup development environment to get started working with/on DFFML -right away. However, it comes with the master branch installed, you'll need to +right away. However, it comes with the main branch installed, you'll need to run the above commands to get the latest released version. .. image:: https://gitpod.io/button/open-in-gitpod.svg diff --git a/docs/tutorials/dataflows/chatbot.rst b/docs/tutorials/dataflows/chatbot.rst index 296bf357e3..1cb53209c9 100644 --- a/docs/tutorials/dataflows/chatbot.rst +++ b/docs/tutorials/dataflows/chatbot.rst @@ -19,7 +19,7 @@ messages which are directed to our bot. .. note:: All the code for this example is located under the - `examples/dataflow/chatbot `_ + `examples/dataflow/chatbot `_ directory of the DFFML source code. You'll need to install `aiohttp `_ diff --git a/docs/tutorials/dataflows/locking.rst b/docs/tutorials/dataflows/locking.rst index 6a57d92946..47d792c67e 100644 --- a/docs/tutorials/dataflows/locking.rst +++ b/docs/tutorials/dataflows/locking.rst @@ -8,7 +8,7 @@ This example shows one such usage. .. note:: All the code for this example is located under the - `examples/dataflow/locking `_ + `examples/dataflow/locking `_ directory of the DFFML source code. First we import required packages and objects, and create Definitions for each diff --git a/docs/tutorials/models/docs.rst b/docs/tutorials/models/docs.rst index c0b51f2a0a..058399b8ef 100644 --- a/docs/tutorials/models/docs.rst +++ b/docs/tutorials/models/docs.rst @@ -177,7 +177,7 @@ Testing Examples ---------------- Using the -`consoletest `_ +`consoletest `_ module we can test the ``code-block`` sections within the docstring. DFFML has a :py:func:`run_consoletest ` function we will be using. diff --git a/examples/shouldi/README.md b/examples/shouldi/README.md index b23095c988..a36ebddc4d 100644 --- a/examples/shouldi/README.md +++ b/examples/shouldi/README.md @@ -1,6 +1,6 @@ # shouldi -![shouldi](https://github.com/intel/dffml/raw/master/examples/shouldi/shouldi.jpg) +![shouldi](https://github.com/intel/dffml/raw/main/examples/shouldi/shouldi.jpg) ## What Is ShouldI? diff --git a/examples/shouldi/setup.cfg b/examples/shouldi/setup.cfg index 1042bce0ec..f031479d57 100644 --- a/examples/shouldi/setup.cfg +++ b/examples/shouldi/setup.cfg @@ -8,7 +8,7 @@ author = John Andersen author_email = john.s.andersen@intel.com maintainer = John Andersen maintainer_email = john.s.andersen@intel.com -url = https://github.com/intel/dffml/blob/master/examples/shouldi/README.md +url = https://github.com/intel/dffml/blob/main/examples/shouldi/README.md license = MIT keywords = dffml classifiers = diff --git a/feature/auth/setup.py b/feature/auth/setup.py index e723cf5299..fe33a5cdf5 100644 --- a/feature/auth/setup.py +++ b/feature/auth/setup.py @@ -30,7 +30,7 @@ long_description_content_type="text/markdown", author="John Andersen", author_email="john.s.andersen@intel.com", - url="https://github.com/intel/dffml/blob/master/feature/auth/README.md", + url="https://github.com/intel/dffml/blob/main/feature/auth/README.md", license="MIT", keywords=[""], classifiers=[ diff --git a/feature/git/README.md b/feature/git/README.md index fc40b33f93..7203c1c900 100644 --- a/feature/git/README.md +++ b/feature/git/README.md @@ -4,7 +4,7 @@ Git features scrape data from Git repositories. ## Demo -![Demo](https://github.com/intel/dffml/raw/master/docs/images/commits_demo.gif) +![Demo](https://github.com/intel/dffml/raw/main/docs/images/commits_demo.gif) ## Usage diff --git a/feature/git/setup.py b/feature/git/setup.py index b37ecebbeb..63d3ec5bcc 100644 --- a/feature/git/setup.py +++ b/feature/git/setup.py @@ -30,7 +30,7 @@ long_description_content_type="text/markdown", author="John Andersen", author_email="john.s.andersen@intel.com", - url="https://github.com/intel/dffml/blob/master/feature/git/README.md", + url="https://github.com/intel/dffml/blob/main/feature/git/README.md", license="MIT", keywords=[""], classifiers=[ diff --git a/model/daal4py/README.md b/model/daal4py/README.md index 7061487884..8a09aef8a2 100644 --- a/model/daal4py/README.md +++ b/model/daal4py/README.md @@ -6,7 +6,7 @@ DAAL4Py models. ## Demo -![Demo](https://github.com/intel/dffml/raw/master/docs/images/model_demo.gif) +![Demo](https://github.com/intel/dffml/raw/main/docs/images/model_demo.gif) ## License diff --git a/model/scikit/setup.py b/model/scikit/setup.py index 0f24d0f4c9..7636857d9f 100644 --- a/model/scikit/setup.py +++ b/model/scikit/setup.py @@ -41,7 +41,7 @@ author_email="yashlamba2000@gmail.com", maintainer="John Andersen", maintainer_email="john.s.andersen@intel.com", - url="https://github.com/intel/dffml/blob/master/model/scikit/README.md", + url="https://github.com/intel/dffml/blob/main/model/scikit/README.md", license="MIT", keywords=["dffml"], classifiers=[ diff --git a/model/scratch/setup.py b/model/scratch/setup.py index 23e73b9fd9..9b33b5330b 100644 --- a/model/scratch/setup.py +++ b/model/scratch/setup.py @@ -32,7 +32,7 @@ author_email="yashlamba2000@gmail.com", maintainer="John Andersen", maintainer_email="john.s.andersen@intel.com", - url="https://github.com/intel/dffml/blob/master/model/scratch/README.md", + url="https://github.com/intel/dffml/blob/main/model/scratch/README.md", license="MIT", keywords=["dffml"], classifiers=[ diff --git a/model/spacy/setup_common.py b/model/spacy/setup_common.py index c017087151..9568001a34 100644 --- a/model/spacy/setup_common.py +++ b/model/spacy/setup_common.py @@ -38,7 +38,7 @@ author_email=AUTHOR_EMAIL, maintainer=AUTHOR_NAME, maintainer_email=AUTHOR_EMAIL, - url="https://github.com/intel/dffml/blob/master/model/spacy/README.md", + url="https://github.com/intel/dffml/blob/main/model/spacy/README.md", license="MIT", keywords=["dffml"], classifiers=[ diff --git a/model/tensorflow/README.md b/model/tensorflow/README.md index 954f17f391..2dc96c6204 100644 --- a/model/tensorflow/README.md +++ b/model/tensorflow/README.md @@ -2,7 +2,7 @@ ## Demo -![Demo](https://github.com/intel/dffml/raw/master/docs/images/iris_demo.gif) +![Demo](https://github.com/intel/dffml/raw/main/docs/images/iris_demo.gif) > This demo was taken before the below steps were updated, the actual accuracy > may vary as this video shows accuracy being assessed against the training diff --git a/model/tensorflow/setup.py b/model/tensorflow/setup.py index 7dd708fc15..295a706fa0 100644 --- a/model/tensorflow/setup.py +++ b/model/tensorflow/setup.py @@ -30,7 +30,7 @@ long_description_content_type="text/markdown", author="John Andersen", author_email="john.s.andersen@intel.com", - url="https://github.com/intel/dffml/blob/master/model/tensorflow/README.md", + url="https://github.com/intel/dffml/blob/main/model/tensorflow/README.md", license="MIT", keywords=[""], classifiers=[ diff --git a/model/tensorflow_hub/setup.py b/model/tensorflow_hub/setup.py index 33d48e5489..c54ea0385f 100644 --- a/model/tensorflow_hub/setup.py +++ b/model/tensorflow_hub/setup.py @@ -30,7 +30,7 @@ long_description_content_type="text/markdown", author="Himanshu Tripathi", author_email="himanshutripathi366@gmail.com", - url="https://github.com/intel/dffml/blob/master/model/tensorflow_hub/README.md", + url="https://github.com/intel/dffml/blob/main/model/tensorflow_hub/README.md", license="MIT", keywords=[""], classifiers=[ diff --git a/model/vowpalWabbit/setup.py b/model/vowpalWabbit/setup.py index 56f36786b2..29632f8db1 100644 --- a/model/vowpalWabbit/setup.py +++ b/model/vowpalWabbit/setup.py @@ -41,7 +41,7 @@ author_email="himanshutripathi366@gmail.com", maintainer="John Andersen", maintainer_email="john.s.andersen@intel.com", - url="https://github.com/intel/dffml/blob/master/model/vowpalWabbit/README.md", + url="https://github.com/intel/dffml/blob/main/model/vowpalWabbit/README.md", license="MIT", keywords=["dffml"], classifiers=[ diff --git a/operations/binsec/setup.py b/operations/binsec/setup.py index 8b5bad5cdc..47e494b62f 100644 --- a/operations/binsec/setup.py +++ b/operations/binsec/setup.py @@ -30,7 +30,7 @@ long_description_content_type="text/markdown", author="Himanshu Tripathi", author_email="himanshutripathi366@gmail.com", - url="https://github.com/intel/dffml/blob/master/operations/binsec/README.md", + url="https://github.com/intel/dffml/blob/main/operations/binsec/README.md", license="MIT", keywords=[""], classifiers=[ diff --git a/operations/deploy/tests/test_operations.py b/operations/deploy/tests/test_operations.py index 95f6f4ee2b..5f7dffefe3 100644 --- a/operations/deploy/tests/test_operations.py +++ b/operations/deploy/tests/test_operations.py @@ -56,10 +56,10 @@ async def setUp(self): ] test_data = { - "ref": "refs/master", + "ref": "refs/main", "repository": { "clone_url": f"https://github.com/{USER}/{REPO}.git", - "default_branch": "master", + "default_branch": "main", "html_url": f"https://github.com/{USER}/{REPO}", }, } diff --git a/scripts/check_literalincludes.py b/scripts/check_literalincludes.py index d9233a0d58..5221eef951 100755 --- a/scripts/check_literalincludes.py +++ b/scripts/check_literalincludes.py @@ -44,7 +44,7 @@ def main(): check_changed[referenced].setdefault(contains_literalinclude, False) # Get the list of changed files changed_files = subprocess.check_output( - ["git", "diff-index", "origin/master"] + ["git", "diff-index", "origin/main"] ) changed_files = changed_files.decode() changed_files = list( diff --git a/service/http/setup.py b/service/http/setup.py index a744319958..09a8d1102f 100644 --- a/service/http/setup.py +++ b/service/http/setup.py @@ -41,7 +41,7 @@ author_email=AUTHOR_EMAIL, maintainer=AUTHOR_NAME, maintainer_email=AUTHOR_EMAIL, - url=f"https://github.com/{ORG}/dffml/tree/master/service/http", + url=f"https://github.com/{ORG}/dffml/tree/main/service/http", license="MIT", keywords=["dffml"], classifiers=[ diff --git a/source/mysql/setup_common.py b/source/mysql/setup_common.py index 53d89867cf..b9b2eacbf7 100644 --- a/source/mysql/setup_common.py +++ b/source/mysql/setup_common.py @@ -38,7 +38,7 @@ author_email=AUTHOR_EMAIL, maintainer="John Andersen", maintainer_email="johnandersenpdx@gmail.com", - url=f"https://github.com/{ORG}/dffml/blob/master/source/{NAME}/README.md", + url=f"https://github.com/{ORG}/dffml/blob/main/source/{NAME}/README.md", license="MIT", keywords=["dffml"], classifiers=[