Migrated package manager from pipenv to poetry (#26)

Migrated package manager from pipenv to poetry

.dockerignore

@@ -1,3 +1,5 @@
 .git
+dist
+.pytest_cache
 volumes
 .env*

.env.localhost.template

@@ -1,5 +1,5 @@
 # COMMONS
-MONGODB_URL=mongodb://localhost:27017/winds_mobi
+MONGODB_URL=mongodb://localhost:27017/winds
 REDIS_URL=redis://localhost:6380/0
 GOOGLE_API_KEY=
 

.env.template

@@ -1,5 +1,5 @@
 # COMMONS
-MONGODB_URL=mongodb://mongodb:27017/winds_mobi
+MONGODB_URL=mongodb://mongodb:27017/winds
 REDIS_URL=redis://host.docker.internal:6380/0
 GOOGLE_API_KEY=
 

.github/workflows/test-python.yml

@@ -20,16 +20,16 @@ jobs:
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
-      - name: Install python dependencies with pipenv
+      - name: Install python dependencies with poetry
         run: |
-          pip install pipenv
-          pipenv install --deploy --dev
+          pip install poetry
+          poetry install
 
       - name: Check python code format
-        run: pipenv run black --check .
+        run: poetry run black --check .
 
       - name: Run python linter
-        run: pipenv run flake8 .
+        run: poetry run flake8 .
 
       - name: Run python tests
-        run: pipenv run pytest
+        run: poetry run pytest

.gitignore

@@ -1,4 +1,6 @@
 *.pyc
+dist/
+.pytest_cache
 .idea/
 /volumes/
 .env

Dockerfile

@@ -10,10 +10,10 @@ FROM base AS python
 
 RUN apt update; \
     apt --yes --no-install-recommends install build-essential libpq-dev libmariadb-dev
-RUN pip install pipenv
+RUN pip install poetry
 
 COPY . .
-RUN PIPENV_VENV_IN_PROJECT=1 pipenv install --deploy
+RUN POETRY_VIRTUALENVS_IN_PROJECT=true poetry install --no-dev
 
 FROM base AS runtime
 

README.md

@@ -16,7 +16,7 @@ Google Cloud API results are cached with redis.
 
 ### Requirements
 
-- python 3.9 
+- python 3.9 and poetry 
 - mongodb 4.4
 - redis
 - Google Cloud API key
@@ -25,6 +25,9 @@ See [settings.py](https://github.com/winds-mobi/winds-mobi-providers/blob/master
 
 #### macOS 11
 
+- `brew install openssl`
+- `export LDFLAGS=-L/usr/local/opt/openssl/lib`
+
 - `brew install mysql-client`
 - `export PATH=/usr/local/opt/mysql-client/bin:$PATH`
 
@@ -36,8 +39,8 @@ See [settings.py](https://github.com/winds-mobi/winds-mobi-providers/blob/master
 
 ### Python environment
 
-- `pipenv install`
-- `pipenv shell`
+- `poetry install`
+- `poetry shell`
 
 ### Run the project with docker compose
 

admin_clusters.py

@@ -11,7 +11,7 @@
 from winds_mobi_provider.logging import configure_logging
 
 configure_logging()
-log = logging.getLogger(__file__)
+log = logging.getLogger(__name__)
 
 
 def save_clusters(nb_clusters):
@@ -68,6 +68,7 @@ def save_clusters(nb_clusters):
                 mongo_bulk.find({"_id": ids[index]}).update({"$addToSet": {"clusters": int(n_clusters)}})
 
         mongo_bulk.execute()
+        log.info(f"Done, created {nb_clusters} clusters")
     except Exception as e:
         log.exception(f"Error while creating clusters: {e}")
 

admin_stations.py

@@ -9,7 +9,7 @@
 from winds_mobi_provider.logging import configure_logging
 
 configure_logging()
-log = logging.getLogger(__file__)
+log = logging.getLogger(__name__)
 
 
 def delete_stations(days: int, provider: Optional[str]):
@@ -20,13 +20,16 @@ def delete_stations(days: int, provider: Optional[str]):
     query = {"seen": {"$lt": now - days * 3600 * 24}}
     if provider:
         query["pv-code"] = provider
+    nb = 0
     for station in mongo_db.stations.find(query):
         seen = arrow.Arrow.fromtimestamp(station["seen"])
         log.info(
             f"Deleting {station['_id']} ['{station['short']}'], last seen at {seen.format('YYYY-MM-DD HH:mm:ssZZ')}"
         )
         mongo_db[station["_id"]].drop()
         mongo_db.stations.remove({"_id": station["_id"]})
+        nb += 1
+    log.info(f"Done, deleted {nb} stations")
 
 
 if __name__ == "__main__":