Merge pull request #94 from UCSD-E4E/dependabot/pip/requests-2.32.0

Bump requests from 2.31.0 to 2.32.0
UCSD-E4E · May 21, 2024 · c7946c6 · c7946c6
2 parents 94ee3e1 + d0f7a1f
commit c7946c6
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/.github/workflows/osx64_pytest.yml b/.github/workflows/osx64_pytest.yml
@@ -11,8 +11,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python 3.9
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
+        miniconda-version: latest
         auto-update-conda: false
         activate-environment: rctGCS
         environment-file: conda-osx-64-lock.yml

diff --git a/.github/workflows/ubuntu_pytest.yml b/.github/workflows/ubuntu_pytest.yml
@@ -11,8 +11,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python 3.9
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
+        miniconda-version: latest
         auto-update-conda: false
         activate-environment: rctGCS
         environment-file: conda-linux-64-lock.yml

diff --git a/.github/workflows/windows_pytest.yml b/.github/workflows/windows_pytest.yml
@@ -11,8 +11,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python 3.9
-      uses: conda-incubator/setup-miniconda@v2
+      uses: conda-incubator/setup-miniconda@v3
       with:
+        miniconda-version: latest
         auto-update-conda: false
         activate-environment: rctGCS
         environment-file: conda-win-64-lock.yml

diff --git a/RctGcs/rctGCS.py b/RctGcs/rctGCS.py
@@ -125,10 +125,6 @@ def main():
 
     app = QgsApplication([], True)
 
-    prefix_path = configSetup()
-
-    QgsApplication.setPrefixPath(str(prefix_path), True)
-
     app.initQgis()
 
     ex = GCS()

diff --git a/poetry.lock b/poetry.lock
diff --git a/tests/test_configuration.py b/tests/test_configuration.py
@@ -13,8 +13,5 @@
 
 
 def test_configuration():
-    with get_instance(get_config_path()) as config:
-        prefix_path = config.qgis_prefix_path
-    QgsApplication.setPrefixPath(str(prefix_path), True)
     default_styles = QgsStyle.defaultStyle()
     assert len(default_styles.colorRampNames()) > 0