Updated conda reqs files for new packages (#758)

* Updated conda reqs files for new packages

* Updating version to 2.11

* Fix for missing label in RDAP data

* Fix for missing 'label' item in RDAP data

conda/README.md

@@ -21,23 +21,20 @@ an up-to-date version of Anaconda these versions should be
 compatible with *msticpy*.
 
 ### Create your Conda environment
-Python 3.7.6 was the latest Python 3.7 release at the time of
-writing. Some wheels are not yet available for Windows for
-Python 3.8, so you may have problems installing some of the
-*msticpy* dependencies on Windows. *msticpy* should, however,
-work fine with Python 3.8.
+
 
 ```shell
-conda create --name my_env_name python=3.7.6
+conda create --name my_env_name python=3.10
 conda activate my_env_name
 ```
 
-## Append the Conda-Forge channel
+## Append the Microsoft and Conda-Forge channels
+
 Some of the Conda packages are only available from
-Conda-Forge.
+Microsoft or Conda-Forge.
 
 ```shell
-conda config --add channels conda-forge
+conda config --append channels Microsoft conda-forge
 ```
 
 ## Install the Conda packages

conda/conda-reqs-dev-pip.txt

@@ -1,6 +1,2 @@
 async-cache>=1.1.1
-pygeohash>=1.2.0
-pyroma>=3.1
-pytest-check>=1.0.1
-pytest-xdist>=2.5.0
 types-attrs>=19.0.0

conda/conda-reqs-dev.txt

@@ -21,7 +21,12 @@ pyflakes>=2.2.0
 pylint>=2.5.3
 pytest-cov>=2.11.1
 pytest>=5.0.1
+pygeohash>=1.2.0
+pyroma>=3.1
+pytest-check>=1.0.1
+pytest-xdist>=2.5.0
 respx>=0.20.1
 sphinx_rtd_theme>=0.5.1
 sphinx>=2.1.2
 virtualenv
+

conda/conda-reqs-pip.txt

@@ -1,7 +1,8 @@
-azure-mgmt-monitor>=2.0.0
 azure-mgmt-resourcegraph>=8.0.0
-azure-mgmt-subscription>=3.0.0
-KqlmagicCustom[jupyter-basic,auth_code_clipboard]>=0.1.114.post22
+azure-monitor-query>=1.0.0, <=2.0.0
+# KqlmagicCustom[jupyter-basic,auth_code_clipboard]>=0.1.114.post22
 mo-sql-parsing>=8, <9.0.0
+nest_asyncio>=1.4.0
 passivetotal>=2.5.3
+sumologic-sdk>=0.1.11
 splunk-sdk>=1.6.0

conda/conda-reqs.txt

@@ -7,10 +7,11 @@ azure-keyvault-secrets>=4.0.0
 azure-kusto-data>=4.0.0, <=5.0.0
 azure-mgmt-compute>=4.6.2
 azure-mgmt-keyvault>=2.0.0
+azure-mgmt-monitor
 azure-mgmt-network>=2.7.0
 azure-mgmt-resource>=16.1.0
-azure-monitor-query>=1.0.0, <=2.0.0
 azure-storage-blob>=12.5.0
+azure-mgmt-subscription
 beautifulsoup4>=4.0.0
 bokeh>=1.4.0, <4.0.0
 cryptography>=3.1

msticpy/_version.py

@@ -1,3 +1,3 @@
 """Version file."""
 
-VERSION = "2.10.0"
+VERSION = "2.11.0"

msticpy/context/ip_utils.py

@@ -659,7 +659,7 @@ def _find_address(
         return None
     for vcard in [vcard for vcard in entity["vcardArray"] if isinstance(vcard, list)]:
         for vcard_sub in vcard:
-            if vcard_sub[0] == "adr":
+            if len(vcard) >= 2 and vcard_sub[0] == "adr" and "label" in vcard_sub[1]:
                 return vcard_sub[1]["label"]
     return None
 

tests/context/test_geoip.py

@@ -54,7 +54,7 @@ def test_geoiplite_download(tmp_path):
     tgt_folder = Path(test_folder).resolve()
     try:
         tgt_folder.mkdir(exist_ok=True)
-        with pytest.warns(None) as warning_record:
+        with pytest.warns(UserWarning) as warning_record:
             with custom_mp_config(_MP_CONFIG_PATH):
                 ip_location = GeoLiteLookup(
                     db_folder=str(tgt_folder), force_update=True, debug=True