Merge branch 'main' into pages

environment.yml

@@ -1,12 +1,12 @@
 name: howbadismybatch-venv
 channels:
   - defaults
-  # - conda-forge
+  - conda-forge
 dependencies:
   - python=3.9
   - ipykernel
   - numpy
-  - pandas
+  - pandas=1.4.0
   - urllib3
   - requests
   - bs4
@@ -18,8 +18,8 @@ dependencies:
   - openpyxl
   - tqdm
   - simplejson
-  # - python-decouple
+  - python-decouple
-  # - selenium
+  - selenium
-  # - webdriver-manager
+  - webdriver-manager
-  # - pycountry
+  - pycountry
-prefix: /home/frankknoll/anaconda3/envs/howbadismybatch-venv
+prefix: /home/frank/miniconda3/envs/howbadismybatch-venv

src/GoogleAnalytics/FilesProviderTest.py

@@ -16,8 +16,8 @@ class FilesProviderTest(unittest.TestCase):
         self.assertEqual(
             files,
             [
-                dataDir + '/CountryByBatchcode 20230730-20230929.csv',
+                dataDir + '/CountryByBatchcode 20230929-20230930.csv',
-                dataDir + '/CountryByBatchcode 20230929-20230930.csv'
+                dataDir + '/CountryByBatchcode 20230730-20230929.csv'
             ])
 
     def test_getFilesHavingCountryResolution(self):

src/help.txt

@@ -34,6 +34,8 @@ update howbadismybatch-venv:
 conda activate howbadismybatch-venv
 conda env update --file environment.yml --prune
 
+conda remove -n howbadismybatch-venv --all
+
 www.HowBadIsMyBatch.info
 /etc/apache2/sites-available/HowBadIsMyBatch.conf