Hydro-Quebec-API-Wrapper 3.1.0__tar.gz → 3.1.1__tar.gz

{Hydro-Quebec-API-Wrapper-3.1.0 → Hydro-Quebec-API-Wrapper-3.1.1}/.gitignore

@@ -124,6 +124,11 @@ venv.bak/
 .mypy_cache/
 .dmypy.json
 dmypy.json
+mypy-html-report/
+mypy-junit.xml
+mypy-txt-report/
+classes.html
+packages.html
 
 # Pyre type checker
 .pyre/
@@ -131,5 +136,17 @@ dmypy.json
 config.yaml
 .idea/
 
+# gitlab-ci-local
+.gitlab-ci-local-env
+.gitlab-ci-local/
+.gitlab-ci-local-variables.yml
+
+# Tests results
+mypy*
+packages.html
+classes.html
+
+
 diagnostic.zip
 /diagnostic/
+

{Hydro-Quebec-API-Wrapper-3.1.0 → Hydro-Quebec-API-Wrapper-3.1.1}/.gitlab-ci.yml

@@ -1,25 +1,38 @@
+include:
+  - project: "renovate-bot/renovate-runner"
+    file: "/templates/renovate-config-validator.gitlab-ci.yml"
 variables:
   TWINE_USERNAME: __token__
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
 stages:
-- test
-- private_tests
-- private_tests_done
-- pypi
+  - test
+  - private_tests
+  - private_tests_done
+  - pypi
 
 cache:
   key: pip-cache
   paths:
     - .cache/pip
 
+renovate-config-validator:
+  stage: test
+  tags:
+    - hydroqc
+  rules:
+    # Enable for all other branches if it's a MR pipeline
+    - if: "$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID"
+      changes:
+        - renovate.json5
+      when: on_success
+    - when: never
+
 test:
   stage: test
   tags:
-  - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/build:20231127050116
+    - hydroqc
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
   script:
-    #- apt-get update && apt-get install git --no-install-recommends -y graphviz jq python3.10 python3-venv python3-pip git
-    - cat renovate.json |jq > /dev/null 2&>1 || ( echo "renovate.json not valid" && exit 1 )
     - pip install tox
     - tox -e pylint,flake8,pydocstyle,typing,black,deps-conflict --parallel auto
     - cat mypy-txt-report/index.txt
@@ -37,27 +50,27 @@ test:
       - packages.html
   rules:
     # Disable if CI_SKIP is set
-    - if: '$CI_SKIP =~ /test/'
+    - if: "$CI_SKIP =~ /test/"
       when: never
     # Disable if it's a tag pipeline
-    - if: '$CI_COMMIT_TAG'
+    - if: "$CI_COMMIT_TAG"
       when: never
     # Enabled for main branch
-    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'
+    - if: "$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH"
       when: on_success
     # Enable for all other branches if it's a MR pipeline
-    - if: '$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID'
+    - if: "$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID"
       when: on_success
     # Make it manual for external MR
-    - if: '$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_PROJECT_PATH != $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH'
+    - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_PROJECT_PATH != $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH"
       when: manual
     - when: never
 
 .private_test_script: &private_test_script
   stage: private_tests
   tags:
-  - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/build:20231127050116
+    - hydroqc
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
   script:
     #- apt update && apt install -y jq unzip curl
     - >
@@ -156,16 +169,16 @@ test:
       junit: hydroqc/tests_result_junit.*.xml
   rules:
     # Disable if it's a tag pipeline
-    - if: '$CI_COMMIT_TAG'
+    - if: "$CI_COMMIT_TAG"
       when: never
     # Enabled for main branch
-    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'
+    - if: "$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH"
       when: on_success
     # Enable for all other branches if it's a MR pipeline
-    - if: '$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID'
+    - if: "$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID"
       when: on_success
     # Make it manual for external MR
-    - if: '$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_PROJECT_PATH != $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH'
+    - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_PROJECT_PATH != $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH"
       when: manual
     - when: never
 
@@ -174,7 +187,7 @@ D_CPC_titilambert:
     PROJECT_ID: 35085986
   <<: *private_test_script
   rules:
-    - if: '$CI_SKIP =~ /d_cpc_titilambert/'
+    - if: "$CI_SKIP =~ /d_cpc_titilambert/"
       when: never
     - !reference [.private_test_script, rules]
 
@@ -183,7 +196,7 @@ DPC_mdallaire1:
     PROJECT_ID: 39503160
   <<: *private_test_script
   rules:
-    - if: '$CI_SKIP =~ /dpc_mdallaire1/'
+    - if: "$CI_SKIP =~ /dpc_mdallaire1/"
       when: never
     - !reference [.private_test_script, rules]
 
@@ -192,7 +205,7 @@ DT_mdallaire1:
     PROJECT_ID: 52729124
   <<: *private_test_script
   rules:
-    - if: '$CI_SKIP =~ /dt_mdallaire1/'
+    - if: "$CI_SKIP =~ /dt_mdallaire1/"
       when: never
     - !reference [.private_test_script, rules]
 
@@ -201,7 +214,7 @@ D_mdallaire1:
     PROJECT_ID: 52728916
   <<: *private_test_script
   rules:
-    - if: '$CI_SKIP =~ /d_mdallaire1/'
+    - if: "$CI_SKIP =~ /d_mdallaire1/"
       when: never
     - !reference [.private_test_script, rules]
 
@@ -210,7 +223,7 @@ D_weimdall:
     PROJECT_ID: 39038345
   <<: *private_test_script
   rules:
-    - if: '$CI_SKIP =~ /d_weimdall/'
+    - if: "$CI_SKIP =~ /d_weimdall/"
       when: never
     - !reference [.private_test_script, rules]
 
@@ -219,7 +232,7 @@ D_CPC_zepiaf:
     PROJECT_ID: 39098670
   <<: *private_test_script
   rules:
-    - if: '$CI_SKIP =~ /d_cpc_zepiaf/'
+    - if: "$CI_SKIP =~ /d_cpc_zepiaf/"
       when: never
     - !reference [.private_test_script, rules]
 
@@ -228,7 +241,7 @@ D_devzwf:
     PROJECT_ID: 39310934
   <<: *private_test_script
   rules:
-    - if: '$CI_SKIP =~ /d_devzwf/'
+    - if: "$CI_SKIP =~ /d_devzwf/"
       when: never
     - !reference [.private_test_script, rules]
 
@@ -237,15 +250,15 @@ M_hdenergy:
     PROJECT_ID: 41155894
   <<: *private_test_script
   rules:
-    - if: '$CI_SKIP =~ /m_hdenergy/'
+    - if: "$CI_SKIP =~ /m_hdenergy/"
       when: never
     - !reference [.private_test_script, rules]
 
 private_tests_done:
   stage: private_tests_done
   tags:
-  - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/build:20231127050116
+    - hydroqc
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
   script:
     #- apt-get update && apt-get install --no-install-recommends -y python3.10 python3-venv python3-pip --no-install-recommends git
     - echo "Private Tests done"
@@ -268,27 +281,27 @@ private_tests_done:
       - "*-job-end-date.svg"
   rules:
     # Disable if CI_SKIP is set
-    - if: '$CI_SKIP =~ /done/'
+    - if: "$CI_SKIP =~ /done/"
       when: never
     # Disable if it's a tag pipeline
-    - if: '$CI_COMMIT_TAG'
+    - if: "$CI_COMMIT_TAG"
       when: never
     # Enabled for main branch
-    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'
+    - if: "$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH"
       when: on_success
     # Enable for all other branches if it's a MR pipeline
-    - if: '$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID'
+    - if: "$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID"
       when: on_success
     # Make it manual for external MR
-    - if: '$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_PROJECT_PATH != $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH'
+    - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_PROJECT_PATH != $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH"
       when: manual
     - when: never
 
 package:
   stage: test
   tags:
-  - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/build:20231127050116
+    - hydroqc
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
   script:
     # Build a package with a version based on the commmit short sha
     - pip install --upgrade pip
@@ -298,27 +311,27 @@ package:
     - TWINE_PASSWORD=${CI_JOB_TOKEN} TWINE_USERNAME=gitlab-ci-token python3 -m twine upload --verbose --repository-url ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/pypi dist/*
   rules:
     # Disable if CI_SKIP is set
-    - if: '$CI_SKIP =~ /package/'
+    - if: "$CI_SKIP =~ /package/"
       when: never
     # Disable if it's a tag pipeline
-    - if: '$CI_COMMIT_TAG'
+    - if: "$CI_COMMIT_TAG"
       when: never
     # Enabled for main branch
-    - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH'
+    - if: "$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH"
       when: on_success
     # Enable for all other branches if it's a MR pipeline
-    - if: '$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID'
+    - if: "$CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID"
       when: on_success
     # Make it manual for external MR
-    - if: '$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_PROJECT_PATH != $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH'
+    - if: "$CI_MERGE_REQUEST_IID && $CI_MERGE_REQUEST_PROJECT_PATH != $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH"
       when: manual
     - when: never
 
 promote2pypi:
   stage: pypi
   tags:
-  - hydroqc
-  image: registry.gitlab.com/hydroqc/hydroqc-base-container/build:20231127050116
+    - hydroqc
+  image: registry.gitlab.com/hydroqc/hydroqc-base-container/3.11@sha256:049f7935029b57bdb18554561581fde63e454fc51be38b89214ff8dc9de35db0
   script:
     # TODO: try to pull the good package from gitlab pypi repo
     #       then change the version (promote)
@@ -333,8 +346,7 @@ promote2pypi:
     #- |
     #  pip download Hydro-Quebec-API-Wrapper --extra-index-url https://gitlab.com/api/v4/projects/${CI_PROJECT_ID}/packages/pypi/simple --no-deps
     # TODO: open archives edit versions and rebuild archive
-    #- cd ..
-    #- apt-get update && apt-get install --no-install-recommends -y python3.10 python3-venv python3-pip git
+
     # Build package that could be promoted
     - pip install --upgrade pip
     - pip install --upgrade build setuptools_scm twine
@@ -342,8 +354,8 @@ promote2pypi:
     - python3 -m twine check --strict dist/*
     - twine upload --verbose --non-interactive --repository pypi dist/*
   rules:
-    - if: '$CI_SKIP =~ /pypi/'
+    - if: "$CI_SKIP =~ /pypi/"
       when: never
-    - if: '$CI_COMMIT_TAG'
+    - if: "$CI_COMMIT_TAG"
       when: on_success
     - when: never

{Hydro-Quebec-API-Wrapper-3.1.0 → Hydro-Quebec-API-Wrapper-3.1.1}/Hydro_Quebec_API_Wrapper.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Hydro-Quebec-API-Wrapper
-Version: 3.1.0
+Version: 3.1.1
 Summary: A wrapper library to access hydro quebec API and more
 Home-page: https://hydroqc.ca
 Author-email: Hydroqc Team <info@hydroqc.ca>

{Hydro-Quebec-API-Wrapper-3.1.0 → Hydro-Quebec-API-Wrapper-3.1.1}/Hydro_Quebec_API_Wrapper.egg-info/SOURCES.txt

@@ -10,7 +10,7 @@ README.md
 config.default.yaml
 conflict_test_requirements.txt
 pyproject.toml
-renovate.json
+renovate.json5
 setup.cfg
 test_requirements.txt
 tox.ini
@@ -60,7 +60,6 @@ hydroqc/contract/contract_m_gdp.py
 hydroqc/contract/contract_residential.py
 hydroqc/contract/outage.py
 hydroqc/hydro_api/__init__.py
-hydroqc/hydro_api/auth.py
 hydroqc/hydro_api/cache.py
 hydroqc/hydro_api/client.py
 hydroqc/hydro_api/consts.py

{Hydro-Quebec-API-Wrapper-3.1.0 → Hydro-Quebec-API-Wrapper-3.1.1}/Hydro_Quebec_API_Wrapper.egg-info/requires.txt

@@ -2,3 +2,4 @@ aiohttp==3.8.5
 python-dateutil==2.8.2
 pytz==2023.3.post1
 aiocache==0.12.2
+pkce==1.0.3

{Hydro-Quebec-API-Wrapper-3.1.0 → Hydro-Quebec-API-Wrapper-3.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Hydro-Quebec-API-Wrapper
-Version: 3.1.0
+Version: 3.1.1
 Summary: A wrapper library to access hydro quebec API and more
 Home-page: https://hydroqc.ca
 Author-email: Hydroqc Team <info@hydroqc.ca>

{Hydro-Quebec-API-Wrapper-3.1.0 → Hydro-Quebec-API-Wrapper-3.1.1}/hydroqc/error.py

@@ -8,6 +8,12 @@ class HydroQcError(Exception):
 class HydroQcHTTPError(HydroQcError):
     """HTTP HydroQc Error."""
 
+    def __init__(self, message: str, status_code: int | None = None) -> None:
+        """Initialize."""
+        self.message = message
+        self.status_code = status_code
+        super().__init__(message)
+
 
 class HydroQcAnnualError(HydroQcError):
     """Annual HydroQc Error."""