resolving conflicts

CODE_OF_CONDUCT.md

@@ -0,0 +1,4 @@
+## Code of Conduct
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
+opensource-codeofconduct@amazon.com with any additional questions or comments.

CONTRIBUTING.md

@@ -1,133 +1,62 @@
-# Contributing to eland
+# Contributing Guidelines
 
-Eland is an open source project and we love to receive contributions
-from our community --- you! There are many ways to contribute, from
-writing tutorials or blog posts, improving the documentation, submitting
-bug reports and feature requests or writing code which can be
-incorporated into eland itself.
+Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
+documentation, we greatly value feedback and contributions from our community.
 
-## Bug reports
+Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
+information to effectively respond to your bug report or contribution.
 
-If you think you have found a bug in eland, first make sure that you are
-testing against the [latest version of
-eland](https://github.com/elastic/eland) - your issue may already have
-been fixed. If not, search our [issues
-list](https://github.com/elastic/eland/issues) on GitHub in case a
-similar issue has already been opened.
 
-It is very helpful if you can prepare a reproduction of the bug. In
-other words, provide a small test case which we can run to confirm your
-bug. It makes it easier to find the problem and to fix it. Test cases
-should be provided as python scripts, ideally with some details of your
-Elasticsearch environment and index mappings, and (where appropriate) a
-pandas example.
+## Reporting Bugs/Feature Requests
 
-Provide as much information as you can. You may think that the problem
-lies with your query, when actually it depends on how your data is
-indexed. The easier it is for us to recreate your problem, the faster it
-is likely to be fixed.
+We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-## Feature requests
+When filing an issue, please check existing open, or recently closed, issues to make sure somebody else hasn't already
+reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
-If you find yourself wishing for a feature that doesn\'t exist in eland,
-you are probably not alone. There are bound to be others out there with
-similar needs. Many of the features that eland has today have been added
-because our users saw the need. Open an issue on our [issues
-list](https://github.com/elastic/eland/issues) on GitHub which describes
-the feature you would like to see, why you need it, and how it should
-work.
+* A reproducible test case or series of steps
+* The version of our code being used
+* Any modifications you've made relevant to the bug
+* Anything unusual about your environment or deployment
 
-## Contributing code and documentation changes
 
-If you have a bugfix or new feature that you would like to contribute to
-eland, please find or open an issue about it first. Talk about what you
-would like to do. It may be that somebody is already working on it, or
-that there are particular issues that you should know about before
-implementing the change.
+## Contributing via Pull Requests
+Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
 
-We enjoy working with contributors to get their code accepted. There are
-many approaches to fixing a problem and it is important to find the best
-approach before writing too much code.
+1. You are working against the latest source on the *main* branch.
+2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
+3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
 
-Note that it is unlikely the project will merge refactors for the sake
-of refactoring. These types of pull requests have a high cost to
-maintainers in reviewing and testing with little to no tangible benefit.
-This especially includes changes generated by tools.
+To send us a pull request, please:
 
-The process for contributing to any of the [Elastic
-repositories](https://github.com/elastic/) is similar. Details for
-individual projects can be found below.
+1. Fork the repository.
+2. Modify the source; please focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
+3. Ensure local tests pass.
+4. Commit to your fork using clear commit messages.
+5. Send us a pull request, answering any default questions in the pull request interface.
+6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
-### Fork and clone the repository
+GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
+[creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 
-You will need to fork the main eland code or documentation repository
-and clone it to your local machine. See [github help
-page](https://docs.github.com/en/free-pro-team@latest/github/getting-started-with-github/fork-a-repo) for help.
 
-Further instructions for specific projects are given below.
+## Finding contributions to work on
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.
 
-### Submitting your changes
 
-Once your changes and tests are ready to submit for review:
+## Code of Conduct
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
+opensource-codeofconduct@amazon.com with any additional questions or comments.
 
-1. Run the linter and test suite to ensure your changes do not break the existing code:
 
-    (TODO Add link to the testing document)
+## Security issue notifications
+If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
 
-    ``` bash
-    # Run Auto-format, lint, mypy type checker for your changes
-    $ nox -s format
-
-    # Run the test suite
-    $ pytest --doctest-modules eland/ tests/
-    $ pytest --nbval tests/notebook/
-
-    ```
 
-2. Sign the Contributor License Agreement
-
-    Please make sure you have signed our [Contributor License Agreement](https://www.elastic.co/contributor-agreement/).
-    We are not asking you to assign copyright to us, but to give us the right to distribute your code without restriction.
-    We ask this of all contributors in order to assure our users of the origin and continuing existence of the code.
-    You only need to sign the CLA once.
-
-3. Rebase your changes
-
-    Update your local repository with the most recent code from the main
-    eland repository, and rebase your branch on top of the latest main
-    branch. We prefer your initial changes to be squashed into a single
-    commit. Later, if we ask you to make changes, add them as separate
-    commits. This makes them easier to review. As a final step before
-    merging we will either ask you to squash all commits yourself or
-    we\'ll do it for you.
-
-4. Submit a pull request
-
-    Push your local changes to your forked copy of the repository and
-    [submit a pull
-    request](https://docs.github.com/en/free-pro-team@latest/github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests) .
-    In the pull request, choose a title which sums up the changes that you
-    have made, and in the body provide more details about what your
-    changes do. Also mention the number of the issue where discussion
-    has taken place, eg "Closes \#123".
-
-Then sit back and wait. There will probably be discussion about the pull
-request and, if any changes are needed, we would love to work with you
-to get your pull request merged into `eland` .
-
-Please adhere to the general guideline that you should never force push
-to a publicly shared branch. Once you have opened your pull request, you
-should consider your branch publicly shared. Instead of force pushing
-you can just add incremental commits; this is generally easier on your
-reviewers. If you need to pick up changes from main, you can merge
-main into your branch. A reviewer might ask you to rebase a
-long-running pull request in which case force pushing is okay for that
-request. Note that squashing at the end of the review process should
-also not be done, that can be done when the pull request is [integrated
-via GitHub](https://github.com/blog/2141-squash-your-commits).
-
-## Contributing to the eland codebase
+## Licensing
 
+See the [LICENSE](LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 **Repository:** <https://github.com/elastic/eland>
 
 We internally develop using the PyCharm IDE. For PyCharm, we are

LICENSE.txt → LICENSE

@@ -1,3 +1,4 @@
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -172,30 +173,3 @@
       defend, and hold each Contributor harmless for any liability
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

NOTICE

@@ -0,0 +1 @@
+Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.