Merge pull request #8 from someengineering/lloesche/rename

lloesche · web-flow · commit a0188590f05b · 2024-02-26T21:46:44.000+01:00
Rename Resoto -&gt; Fix Inventory
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-*       @lloesche @aquamatthias @meln1k @anjafr
+*       @lloesche @aquamatthias @meln1k
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -17,7 +17,7 @@ body:
     id: version
     attributes:
       label: Version
-      description: What version of Resoto are you running?
+      description: What version of Fix Inventory are you running?
     validations:
       required: true
   - type: input
@@ -52,4 +52,4 @@ body:
   - type: markdown
     attributes:
       value: |
-        By submitting this bug report, I agree to follow the [code of conduct](https://resoto.com/code-of-conduct).
+        By submitting this bug report, I agree to follow the [code of conduct](https://inventory.fix.security/code-of-conduct).
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -4,5 +4,5 @@ contact_links:
     url: https://discord.gg/someengineering
     about: Chat with other users and the development team
   - name: 📄 Documentation
-    url: https://resoto.com/docs
+    url: https://inventory.fix.security/docs
     about: Read and search documentation
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -28,4 +28,4 @@ body:
   - type: markdown
     attributes:
       value: |
-        By submitting this feature request, I agree to follow the [code of conduct](https://resoto.com/code-of-conduct).
+        By submitting this feature request, I agree to follow the [code of conduct](https://inventory.fix.security/code-of-conduct).
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,7 @@
 
 - [ ] Add test coverage for new or updated functionality
 - [ ] Lint and test with `tox`
-- [ ] Document new or updated functionality (someengineering/resoto.com#XXXX)
+- [ ] Document new or updated functionality (someengineering/inventory.fix.security#XXXX)
 
 # Issues Fixed
 
@@ -21,4 +21,4 @@
 
 # Code of Conduct
 
-By submitting this pull request, I agree to follow the [code of conduct](https://resoto.com/code-of-conduct).
+By submitting this pull request, I agree to follow the [code of conduct](https://inventory.fix.security/code-of-conduct).
diff --git a/.github/workflows/fixinventorydata.yml b/.github/workflows/fixinventorydata.yml
@@ -1,4 +1,4 @@
-name: resotodata
+name: fixinventorydata
 on:
   push:
     tags:
@@ -7,12 +7,12 @@ on:
         - main
   pull_request:
     paths:
-      - 'resotodata/**'
+      - 'fixinventorydata/**'
       - '.github/**'
 
 jobs:
-  resotodata:
-    name: "resotodata"
+  fixinventorydata:
+    name: "fixinventorydata"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -21,7 +21,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.10'
+          python-version: '3.11'
           architecture: 'x64'
 
       - name: Restore dependency cache
@@ -53,5 +53,5 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
-          password: ${{ secrets.PYPI_RESOTODATA }}
+          password: ${{ secrets.PYPI_FIXINVENTORYDATA }}
           packages_dir: ./dist/
diff --git a/.gitignore b/.gitignore
@@ -27,8 +27,6 @@ docs/_build/
 .DS_Store
 .coverage
 .dccache
-resotoshell/backup_*
-resotocore/tools/Assets
 out/
 *.iml
 **/.hypothesis/
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1 @@
-include resotodata/data/*
+include fixinventorydata/data/*
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# `resotodata`
-Public Resoto Cloud Data
+# `fixinventorydata`
+Public Fix Inventory Cloud Data
 
 Location data is open data, licensed under the [Open Data Commons Open Database License (ODbL)](https://opendatacommons.org/licenses/odbl/) by the [OpenStreetMap Foundation (OSMF)](https://wiki.osmfoundation.org/wiki/Main_Page).
 
diff --git a/fixinventorydata/__init__.py b/fixinventorydata/__init__.py
@@ -0,0 +1,14 @@
+"""
+Miscellaneous Fix Inventory Data
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Miscellaneous Fix Inventory data.
+:copyright: © 2024 Some Engineering Inc.
+:license: Apache 2.0, see LICENSE for more details.
+"""
+
+__title__ = "fixinventorydata"
+__description__ = "Miscellaneous Fix Inventory data."
+__author__ = "Some Engineering Inc."
+__license__ = "Apache 2.0"
+__copyright__ = "Copyright © 2024 Some Engineering Inc."
+__version__ = "0.2.4"
diff --git a/fixinventorydata/__main__.py b/fixinventorydata/__main__.py
@@ -118,7 +118,7 @@ def gen_aws_regions() -> dict:
 
 
 def write_regions(regions: dict) -> None:
-    regions_file = resource_filename("resotodata", "data/regions.json")
+    regions_file = resource_filename("fixinventorydata", "data/regions.json")
     print(f"Writing regions to {regions_file}")
     with open(regions_file, "w") as f:
         json.dump(regions, f, indent=4)
@@ -179,7 +179,7 @@ def aws_regions() -> dict:
 def lookup_location(short_region: str, long_region: str) -> Optional[Location]:
     try:
         print(f"Looking up {short_region} {long_region}")
-        geolocator = Nominatim(user_agent="ResotoMisc")
+        geolocator = Nominatim(user_agent="FixInventoryMisc")
         loc = geolocator.geocode(long_region)
         print(f"Found {loc}")
         return loc
@@ -189,7 +189,7 @@ def lookup_location(short_region: str, long_region: str) -> Optional[Location]:
 
 def write_colors() -> None:
     colors = {
-        "resoto": {
+        "fixinventory": {
             "light": {
                 "main": [0x762DD7, 0x0A253F, 0xAF62F1],
                 "contrast": [0xFFAF37, 0xE59010, 0xB86200],
@@ -215,23 +215,23 @@ def write_colors() -> None:
         },
     }
 
-    colors_file = resource_filename("resotodata", "data/colors.json")
+    colors_file = resource_filename("fixinventorydata", "data/colors.json")
     print(f"Writing colors to {colors_file}")
     with open(colors_file, "w") as f:
         json.dump(colors, f, indent=4)
         f.write("\n")
 
 
 def write_ccfdataset(ccfdataset: dict) -> None:
-    ccfdataset_file = resource_filename("resotodata", "data/ccfdataset.json")
+    ccfdataset_file = resource_filename("fixinventorydata", "data/ccfdataset.json")
     print(f"Writing CCF dataset to {ccfdataset_file}")
     with open(ccfdataset_file, "w") as f:
         json.dump(ccfdataset, f, indent=4)
         f.write("\n")
 
 
 def write_instances(instances: dict) -> None:
-    instances_file = resource_filename("resotodata", "data/instances.json")
+    instances_file = resource_filename("fixinventorydata", "data/instances.json")
     print(f"Writing instances dataset to {instances_file}")
     with open(instances_file, "w") as f:
         json.dump(instances, f, indent=4)
diff --git a/fixinventorydata/cloud.py b/fixinventorydata/cloud.py
@@ -1,4 +1,4 @@
-from resotodata.utils import LazyLoadedDict
+from fixinventorydata.utils import LazyLoadedDict
 
 
 regions = LazyLoadedDict("regions.json")
diff --git a/fixinventorydata/co2.py b/fixinventorydata/co2.py
@@ -0,0 +1,4 @@
+from fixinventorydata.utils import LazyLoadedDict
+
+
+ccfdataset = LazyLoadedDict("ccfdataset.json")
diff --git a/fixinventorydata/colors.py b/fixinventorydata/colors.py
@@ -0,0 +1,4 @@
+from fixinventorydata.utils import LazyLoadedDict
+
+
+colors = LazyLoadedDict("colors.json")
diff --git a/fixinventorydata/data/ccfdataset.json b/fixinventorydata/data/ccfdataset.json
diff --git a/fixinventorydata/data/colors.json b/fixinventorydata/data/colors.json
@@ -1,5 +1,5 @@
 {
-    "resoto": {
+    "fixinventory": {
         "light": {
             "main": [
                 7744983,
diff --git a/fixinventorydata/data/instances.json b/fixinventorydata/data/instances.json
diff --git a/fixinventorydata/data/regions.json b/fixinventorydata/data/regions.json
diff --git a/fixinventorydata/utils.py b/fixinventorydata/utils.py
@@ -4,7 +4,7 @@
 
 
 class LazyLoadedDict(dict):
-    BASE_PACKAGE = "resotodata"
+    BASE_PACKAGE = "fixinventorydata"
     DATA_DIR = "data"
 
     def __init__(self, filename):
diff --git a/resotodata/__init__.py b/resotodata/__init__.py
diff --git a/resotodata/co2.py b/resotodata/co2.py
diff --git a/resotodata/colors.py b/resotodata/colors.py
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-import resotodata
+import fixinventorydata
 from setuptools import setup, find_packages
 
 
@@ -16,19 +16,19 @@
 
 
 setup(
-    name=resotodata.__title__,
-    version=resotodata.__version__,
-    description=resotodata.__description__,
-    license=resotodata.__license__,
+    name=fixinventorydata.__title__,
+    version=fixinventorydata.__version__,
+    description=fixinventorydata.__description__,
+    license=fixinventorydata.__license__,
     packages=find_packages(),
     long_description=readme,
     long_description_content_type="text/markdown",
     entry_points={
         "console_scripts": [
-            "resotodata-update-regions = resotodata.__main__:update_regions",
-            "resotodata-update-colors = resotodata.__main__:update_colors",
-            "resotodata-update-ccfdataset = resotodata.__main__:update_ccfdataset",
-            "resotodata-update-instances = resotodata.__main__:update_instances",
+            "fixinventorydata-update-regions = fixinventorydata.__main__:update_regions",
+            "fixinventorydata-update-colors = fixinventorydata.__main__:update_colors",
+            "fixinventorydata-update-ccfdataset = fixinventorydata.__main__:update_ccfdataset",
+            "fixinventorydata-update-instances = fixinventorydata.__main__:update_instances",
         ]
     },
     include_package_data=True,
diff --git a/test/test_args.py b/test/test_args.py
@@ -1,4 +1,4 @@
-from resotodata.cloud import regions
+from fixinventorydata.cloud import regions
 
 
 def test_data():
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@ exclude = .git,.tox,__pycache__,.idea,.pytest_cache,venv
 ignore=F403, F405, E722, N806, N813, E266, W503, E203
 
 [pytest]
-addopts=  -rs -vv --cov=resotodata --cov-report html
+addopts=  -rs -vv --cov=fixinventorydata --cov-report html
 testpaths= test
 
 [testenv]

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-* @lloesche @aquamatthias @meln1k @anjafr`
	`1`	`+* @lloesche @aquamatthias @meln1k`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include resotodata/data/*`
	`1`	`+include fixinventorydata/data/*`