Resolved merge conflicts

Author: Bransthre

Pipfile

@@ -5,6 +5,7 @@ name = "pypi"
 
 [packages]
 flickrapi = "*"
+internetarchive = "*"
 numpy = "*"
 pandas = "*"
 requests = "*"
@@ -16,4 +17,4 @@ flake8 = "*"
 isort = "*"
 
 [requires]
-python_version = "3.9"
+python_version = "3.10"

Pipfile.lock

@@ -27,13 +27,42 @@ collection of works that are openly licensed or in the public domain.
 See [`CONTRIBUTING.md`](CONTRIBUTING.md).
 
 
-## Data Sources
-### MediaWiki
-Provides metadata from search queries in WikiCommons.\
-Main documentation page:\
-https://www.mediawiki.org/wiki/API:Main_page
+## Development
 
 
+### Prerequisites
+
+This repository uses [pipenv][pipenvdocs] to manage the required Python
+modules:
+- Linux: [Installing Pipenv][pipenvinstall]
+- macOS:
+  1. Install [Homebrew][homebrew]
+  2. Install pipenv:
+        ```
+        brew install pipenv
+        ```
+
+[pipenvdocs]: https://pipenv.pypa.io/en/latest/
+[homebrew]: https://brew.sh/
+[pipenvinstall]: https://pipenv.pypa.io/en/latest/install/#installing-pipenv
+
+
+### Tooling
+
+- **[Python Guidelines — Creative Commons Open Source][ccospyguide]**
+- [Black][black]: the uncompromising Python code formatter
+- [flake8][flake8]: a python tool that glues together pep8, pyflakes, mccabe,
+  and third-party plugins to check the style and quality of some python code.
+- [isort][isort]: A Python utility / library to sort imports.
+
+[ccospyguide]: https://opensource.creativecommons.org/contributing-code/python-guidelines/
+[black]: https://github.com/psf/black
+[flake8]: https://gitlab.com/pycqa/flake8
+[isort]: https://pycqa.github.io/isort/
+
+
+### Data Sources
+
 Example query:\
 https://commons.wikimedia.org/w/api.php?action=query&cmtitle=Category:CC-BY&list=categorymembers