Merged conflicts

AlexGherardelli · AlexGherardelli · commit 4b0d94379564 · 2024-04-16T12:59:05.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -164,4 +164,5 @@ config.py
 *.xlsx
 .env
 playground.py
-profile.html
+profile.html
+*.bak
diff --git a/environment.yml b/environment.yml
@@ -1,4 +1,4 @@
-name: vam
+name: datalib
 channels:
   - conda-forge
   - defaults
@@ -128,14 +128,11 @@ dependencies:
   - pip:
       - annotated-types==0.6.0
       - anyio==4.3.0
-      - data-bridges-client==1.0.0
       - h11==0.14.0
       - httpcore==1.0.4
       - httpx==0.27.0
-      - pd-to-mssql==0.2.1
       - pydantic==2.6.4
       - pydantic-core==2.16.3
-      - pyinstrument==4.6.2
       - sniffio==1.3.1
       - typing-extensions==4.10.0
       - urllib3==2.0.7
diff --git a/output/2023_01_30_datalib_all_survey_info.xlsx b/output/2023_01_30_datalib_all_survey_info.xlsx
diff --git a/run.bat b/run.bat
@@ -0,0 +1,33 @@
+@echo OFF
+rem How to run a Python script in a given conda environment from a batch file.
+
+rem It doesn't require:
+rem - conda to be in the PATH
+rem - cmd.exe to be initialized with conda init
+
+rem Define here the path to your conda installation
+set CONDAPATH=E:\ProgramData\Anaconda3
+rem Define here the name of the environment
+set ENVNAME=datalib
+
+rem The following command activates the base environment.
+rem call C:\ProgramData\Miniconda3\Scripts\activate.bat C:\ProgramData\Miniconda3
+if %ENVNAME%==base (set ENVPATH=%CONDAPATH%) else (set ENVPATH=%CONDAPATH%\envs\%ENVNAME%)
+
+rem Activate the conda environment
+rem Using call is required here, see: https://stackoverflow.com/questions/24678144/conda-environments-and-bat-files
+call %CONDAPATH%\Scripts\activate.bat %ENVPATH%
+
+rem Run a python script in that environment
+python main.py
+
+rem Deactivate the environment
+call conda deactivate
+
+rem If conda is directly available from the command line then the following code works.
+rem call activate someenv
+rem python script.py
+rem conda deactivate
+
+rem One could also use the conda run command
+rem conda run -n someenv python script.py
