diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml new file mode 100644 index 0000000..513c356 --- /dev/null +++ b/.github/workflows/ci.yaml @@ -0,0 +1,10 @@ +name: CI + +on: push + +jobs: + UnitTest: + name: Python Unit Test + uses: uc-cdis/.github/.github/workflows/python_unit_test.yaml@master + with: + python-version: '3.9' diff --git a/.github/workflows/pypi.yaml b/.github/workflows/pypi.yaml new file mode 100644 index 0000000..c436d17 --- /dev/null +++ b/.github/workflows/pypi.yaml @@ -0,0 +1,17 @@ +name: PyPI + +on: + push: + tags: + - '*' + +jobs: + PyPIPoetryPublish: + name: PyPI Poetry Publish + uses: uc-cdis/.github/.github/workflows/python_package_index_publish.yaml@master + with: + PYTHON_VERSION: '3.9' + DO_TEST_PUBLISH_FIRST: true + secrets: + PYPI_TEST_API_TOKEN: ${{ secrets.PYPI_TEST_API_TOKEN }} + PYPI_PROD_API_TOKEN: ${{ secrets.PYPI_PROD_API_TOKEN }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8d9dddd..7bc1727 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: hooks: - id: detect-secrets args: ['--baseline', '.secrets.baseline'] - exclude: python/poetry.lock + exclude: poetry.lock - repo: https://github.com/pre-commit/pre-commit-hooks rev: v2.5.0 hooks: diff --git a/.secrets.baseline b/.secrets.baseline index 6c420c7..a7ef865 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -1,6 +1,6 @@ { "exclude": { - "files": "python/poetry.lock", + "files": "poetry.lock", "lines": null }, "generated_at": "2020-10-26T20:21:52Z", diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 9e7991a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -dist: xenial -language: python -python: -- 3.6 -- 3.7 -cache: -- pip -- apt -install: -- cd python -- pip install poetry -- poetry install -script: -- poetry run pytest -vv --cov=src --cov-report xml tests -after_script: -- pip install codacy-coverage -- python-codacy-coverage -r coverage.xml -before_deploy: -- poetry config http-basic.pypi $PYPI_USER $PYPI_PASSWORD -- poetry build -deploy: - provider: script - script: "poetry publish" - skip_cleanup: true - on: - python: 3.7 - repo: uc-cdis/gen3authz - tags: true -after_deploy: -- pip install gen3git -- gen3git release -env: - global: - - secure: YpbDAuLAkH+O+PRiLTd/DioGDWssLmNIOhhk4bWyhvX3B8sSB6wkiWEQg2SHAqFR08f8/oI/i8H47sajo4CZokrpQlmH80iV58kprn2tfH2zyIpdNot0EexZ0uZDvuGvY6Vzxd81YoWZxF4Ugl37npNrM+EzgkTxqd/63pcUYfPXgwdIxtf4gvBUR5WcrF+j+sWLnRCKk/6iB5Q/lmDLXWMTmPYahgAdPChrbSVD9G6vRnI7aQtkYstsVhmSRz3G6UqCzgFOYcPic3PpeUvULJCDgClabFtbgauzANZQBnPdV3vS2b49QwMf1Z2UfLVUrRNmypmpM4iukaBXkvQ/7hHJyiQvtfXsIvT6udFBMT3U/4CDKmYNIlDiBcP3UFird6wFo135FYEhyDHZTNJwsx4IlLosUG5Ep3gHZJ7IJwbCmMaIBt8W2gRHFN4worNmCxKBX5Ew5S3e/nilcUyYNaEFBSEp6mzaIOKuMC5yQuSuzsa4oCmkPRBZkvOnnhvU0SdNjvRTbmX64koxb3awL7M1YeAlp6osxrFppNxoXcjLuPdLVGLQGnETtxi5GZkmfrnIU/BoM2D/MMIvwRXn5OUofV2OgCrQPUUvsZf/zQk7QKJ53z4p4CpuAgZ8Qk3bw5DI4rJU655tkR88dvZgCrtJ5KkhteeyzNdWGM6OBng= - - secure: QgrUcEsQHo0Q4HX/ykfhfApu7XbZHzVHybhEQw2Y/upg38VghNIl4Gv1e1s/ErkLddENGZdMUWAr5mAVuQGrob1ILQv0QW4btouiaJo80gdW3LjPNGSZd80xwY96ZSoLhP9JATMCBXUXy3NMd66d9S1uRdH1z8JTZ8qI4PBPIrWziz9givbXZcjMlcb6qHtyxjLBwmdwkwJ8TA187a6MAC0zGi2XJVbhQpwDcZBBGhH8WBum1QasPSVTDViCPWWJhlSiV2ihnH+eWcJK1VlBqaykqfZEf5/ksHLzJtS/h8aEbuAU+gHAsLT4fpV1m4sBmxEuHw8SRLwaUuP0CB29EzWCD/klfDp5TD8VLUs5hYyTDPRPPPCLTFbdqJE3oIGTu+GRqoFIOGxH5Ysg4kPAm/2ts7FWB5G3f6nkriG1SQZnw8KdvhKpEEVojw5TtNW1yTqLaitQXRMK/dPnl3FVJ75THvPZKBy75ZnZ0DyFACpnPQPZF7KCNh50IJA1rGuTVtxRuwhbZ6PJET689x9a27aHHY+CEWdhITUpBg2Uhbw2XrRCZnvIKY/ylxTO9ZVzLbTa96TsRcVhDLXkVe7LKCMPamyaa/oiu5oT9c7i3BR35IiHj+aXIG4LFDL7XrqpWpffZ7prLTl6t1k8O7BifUJ5qu7PXtswFYIoar79eGc= - - secure: MkMVFL6tXTgWcQjV1mpndf47bI+fhHDf9tVzr8UeMeJ0pkQ1jLyVmAnHe+Oj3BhciHFdyQJ5o/IKS6Ynz6PSZV/e3wDD9afgb3gw7fj0AbI0klnDGoE1kSdGWzO042zKLituz3xZQ6iAWyHuWMS06fReF8ZOV81yK8pCoQxhY1/mZ3yulCtgi8rdlYo6QJx9txA9IJBZC77f/okUCSVd4pywvjn91CS65EkJ08MrlQipKG5ew2Ysg/ilR+ev8DyrJXWRbG28PEON7/Ld2zlHKLPx7OaPKxQqJvC2Cd2YPq5WHQmx461qgMdmnuZf/h1c8VWgVHCF/wlMLl7EVdGQT0FE4hGohe0GaPfysM3OJsFApHjmcxg6bTFlNNTQtcdBhWBgCSlS6Mro82/nIuo04yTOJgd0MBjDFQH6pnNTUFoYBqVpYdCz3t0hvj1rwUMBxpWfUVuUXaQ59CFCnuGHnSt58XJLne1ZIYjrDyrgUXCMvfZrAM4FFU6/7w7r+IQZW6FbGWZq2pdkVTio+M5g0j7ErskLQ9UwysuuEqqhRQKhmruy9Cj0IxoIljTs333NKauX7RKR35O8YX7Imr0GA8vPmO4jsIK7KfQMQ0fytuZ50tTXeUjnmAtO3lEg3dCv/C+LpFejDNGNYsZldehBTl0TdfJtcRt0/qVW8Sygxyg= diff --git a/LICENSE b/LICENSE index 261eeb9..05f70c4 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2019 University of Chicago Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/python/poetry.lock b/poetry.lock similarity index 100% rename from python/poetry.lock rename to poetry.lock diff --git a/python/pyproject.toml b/pyproject.toml similarity index 100% rename from python/pyproject.toml rename to pyproject.toml diff --git a/python/LICENSE b/python/LICENSE deleted file mode 100644 index 261eeb9..0000000 --- a/python/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - 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. diff --git a/python/src/gen3authz/__init__.py b/src/gen3authz/__init__.py similarity index 100% rename from python/src/gen3authz/__init__.py rename to src/gen3authz/__init__.py diff --git a/python/src/gen3authz/client/__init__.py b/src/gen3authz/client/__init__.py similarity index 100% rename from python/src/gen3authz/client/__init__.py rename to src/gen3authz/client/__init__.py diff --git a/python/src/gen3authz/client/arborist/__init__.py b/src/gen3authz/client/arborist/__init__.py similarity index 100% rename from python/src/gen3authz/client/arborist/__init__.py rename to src/gen3authz/client/arborist/__init__.py diff --git a/python/src/gen3authz/client/arborist/async_client.py b/src/gen3authz/client/arborist/async_client.py similarity index 100% rename from python/src/gen3authz/client/arborist/async_client.py rename to src/gen3authz/client/arborist/async_client.py diff --git a/python/src/gen3authz/client/arborist/base.py b/src/gen3authz/client/arborist/base.py similarity index 100% rename from python/src/gen3authz/client/arborist/base.py rename to src/gen3authz/client/arborist/base.py diff --git a/python/src/gen3authz/client/arborist/client.py b/src/gen3authz/client/arborist/client.py similarity index 100% rename from python/src/gen3authz/client/arborist/client.py rename to src/gen3authz/client/arborist/client.py diff --git a/python/src/gen3authz/client/arborist/errors.py b/src/gen3authz/client/arborist/errors.py similarity index 100% rename from python/src/gen3authz/client/arborist/errors.py rename to src/gen3authz/client/arborist/errors.py diff --git a/python/src/gen3authz/client/base.py b/src/gen3authz/client/base.py similarity index 100% rename from python/src/gen3authz/client/base.py rename to src/gen3authz/client/base.py diff --git a/python/src/gen3authz/client/errors.py b/src/gen3authz/client/errors.py similarity index 100% rename from python/src/gen3authz/client/errors.py rename to src/gen3authz/client/errors.py diff --git a/python/src/gen3authz/utils.py b/src/gen3authz/utils.py similarity index 100% rename from python/src/gen3authz/utils.py rename to src/gen3authz/utils.py diff --git a/python/tests/arborist/conftest.py b/tests/arborist/conftest.py similarity index 100% rename from python/tests/arborist/conftest.py rename to tests/arborist/conftest.py diff --git a/python/tests/arborist/test_health.py b/tests/arborist/test_health.py similarity index 100% rename from python/tests/arborist/test_health.py rename to tests/arborist/test_health.py diff --git a/python/tests/arborist/test_urls.py b/tests/arborist/test_urls.py similarity index 100% rename from python/tests/arborist/test_urls.py rename to tests/arborist/test_urls.py diff --git a/python/tests/conftest.py b/tests/conftest.py similarity index 100% rename from python/tests/conftest.py rename to tests/conftest.py diff --git a/python/tests/test_async_utils.py b/tests/test_async_utils.py similarity index 100% rename from python/tests/test_async_utils.py rename to tests/test_async_utils.py diff --git a/python/tests/test_utils.py b/tests/test_utils.py similarity index 100% rename from python/tests/test_utils.py rename to tests/test_utils.py