diff --git a/.circleci/config.yml b/.circleci/config.yml index 80b6d11..7d5b47e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - opus10: + ambitioneng: executors: python: working_directory: /code @@ -38,20 +38,20 @@ orbs: jobs: test_pg_min: executor: - name: opus10/python + name: ambitioneng/python pg_version: "13.16" steps: - - opus10/test + - ambitioneng/test test_pg_max: executor: - name: opus10/python + name: ambitioneng/python pg_version: "17.0" steps: - - opus10/test + - ambitioneng/test lint: - executor: opus10/python + executor: ambitioneng/python steps: - checkout - restore_cache: @@ -60,7 +60,7 @@ jobs: - run: make lint type_check: - executor: opus10/python + executor: ambitioneng/python steps: - checkout - restore_cache: @@ -69,7 +69,7 @@ jobs: - run: make type-check || true deploy: - executor: opus10/python + executor: ambitioneng/python steps: - checkout - run: ssh-add -D diff --git a/CHANGELOG.md b/CHANGELOG.md index 1877e04..35f2b78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 1.7.1 (2024-12-15) + +#### Changes + + - Changed project ownership to `AmbitionEng` by [@wesleykendall](https://github.com/wesleykendall) in [#14](https://github.com/AmbitionEng/django-pgactivity/pull/14). + ## 1.7.0 (2024-11-01) #### Changes diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 171ea91..f7ee19d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,12 @@ # Contributing Guide -This project was created using footing. For more information about footing, go to the [footing docs](https://github.com/Opus10/footing). +This project was created using footing. For more information about footing, go to the [footing docs](https://github.com/AmbitionEng/footing). ## Setup Set up your development environment with: - git clone git@github.com:Opus10/django-pgactivity.git + git clone git@github.com:AmbitionEng/django-pgactivity.git cd django-pgactivity make docker-setup diff --git a/LICENSE b/LICENSE index 28efb8f..a3cd8ae 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2024, Opus 10 +Copyright (c) 2025, Ambition All rights reserved. Redistribution and use in source and binary forms, with or without @@ -18,7 +18,7 @@ modification, are permitted provided that the following conditions are met: THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL OPUS 10 BE LIABLE FOR ANY +DISCLAIMED. IN NO EVENT SHALL AMBITION BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND diff --git a/Makefile b/Makefile index 013e70a..7a60dc3 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,7 @@ db-setup: # Sets up a conda development environment .PHONY: conda-create conda-create: - -conda env create -f environment.yml --force + -conda env create -f environment.yml -y $(EXEC_WRAPPER) poetry config virtualenvs.create false --local diff --git a/devops.py b/devops.py index ee7f602..306faef 100644 --- a/devops.py +++ b/devops.py @@ -5,10 +5,10 @@ package deployment, changelog generation, and changelog checking. This script is generated by the template at -https://github.com/Opus10/python-library-template +https://github.com/AmbitionEng/python-library-template Do not change this script! Any fixes or updates to this script should be made -to https://github.com/Opus10/python-library-template +to https://github.com/AmbitionEng/python-library-template """ import os @@ -51,7 +51,7 @@ def deploy() -> None: _publish_to_pypi() - print(f"Deployment complete.") + print("Deployment complete.") if __name__ == "__main__": diff --git a/docs/css/mkdocs-material.css b/docs/css/mkdocs-material.css index 22c8f71..68771f8 100644 --- a/docs/css/mkdocs-material.css +++ b/docs/css/mkdocs-material.css @@ -1,24 +1,28 @@ .md-typeset__table { - min-width: 100%; + min-width: 100%; } - + .md-typeset table:not([class]) { - display: table; + display: table; } :root { - --md-primary-fg-color: #BD4D86; - --md-primary-fg-color--light: #BD4D86; - --md-primary-fg-color--dark: #BD4D86; + --md-primary-fg-color: #1d1f29; + --md-primary-fg-color--light: #1d1f29; + --md-primary-fg-color--dark: #1d1f29; +} + +.md-content { +--md-typeset-a-color: #00bc70; } .md-footer { - background-color: #BD4D86; + background-color: #1d1f29; } .md-footer-meta { - background-color: #973E6B; + background-color: #1d1f29; } readthedocs-flyout { - display: none; + display: none; } \ No newline at end of file diff --git a/docs/index.md b/docs/index.md index 38ec207..f3d461c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -58,7 +58,6 @@ import pgactivity def my_operation(): # Any queries in this operation that take over 500 milliseconds will throw # django.db.utils.OperationalError. -``` ## Compatibility diff --git a/docs/static/dark_logo.png b/docs/static/dark_logo.png new file mode 100644 index 0000000..9adb50d Binary files /dev/null and b/docs/static/dark_logo.png differ diff --git a/docs/static/light_logo.png b/docs/static/light_logo.png new file mode 100644 index 0000000..af78360 Binary files /dev/null and b/docs/static/light_logo.png differ diff --git a/docs/static/logo.png b/docs/static/logo.png deleted file mode 100644 index 9f052b7..0000000 Binary files a/docs/static/logo.png and /dev/null differ diff --git a/footing.yaml b/footing.yaml index c1d24fe..1fae2e1 100644 --- a/footing.yaml +++ b/footing.yaml @@ -1,7 +1,7 @@ _extensions: - jinja2_time.TimeExtension _template: git@github.com:Opus10/public-django-app-template.git -_version: 072543e27d8b506a6628f7793798609c62d6a8ae +_version: b7d2321846eeeb120ea9455597ddcf9bd8b5e7a4 check_types_in_ci: 'False' is_django: 'True' module_name: pgactivity diff --git a/mkdocs.yml b/mkdocs.yml index 8b3d34a..59a66d5 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,8 +1,8 @@ site_name: django-pgactivity docs_dir: docs -repo_name: Opus10/django-pgactivity -repo_url: https://github.com/Opus10/django-pgactivity +repo_name: AmbitionEng/django-pgactivity +repo_url: https://github.com/AmbitionEng/django-pgactivity plugins: - search @@ -51,8 +51,8 @@ markdown_extensions: theme: name: material - logo: static/logo.png - favicon: static/logo.png + logo: static/dark_logo.png + favicon: static/light_logo.png features: - content.code.copy - navigation.footer diff --git a/poetry.lock b/poetry.lock index 59609d9..ccae8f4 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1031,6 +1031,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, diff --git a/pyproject.toml b/pyproject.toml index 3174b71..d1b4824 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,7 @@ packages = [ exclude = [ "*/tests/" ] -version = "1.7.0" +version = "1.7.1" description = "Monitor, kill, and analyze Postgres queries." authors = ["Wes Kendall"] classifiers = [ @@ -47,8 +47,8 @@ classifiers = [ ] license = "BSD-3-Clause" readme = "README.md" -homepage = "https://github.com/Opus10/django-pgactivity" -repository = "https://github.com/Opus10/django-pgactivity" +homepage = "https://github.com/AmbitionEng/django-pgactivity" +repository = "https://github.com/AmbitionEng/django-pgactivity" documentation = "https://django-pgactivity.readthedocs.io" [tool.poetry.dependencies]