aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md12
-rw-r--r--setup.py62
-rw-r--r--wikiget/version.py2
3 files changed, 40 insertions, 36 deletions
diff --git a/README.md b/README.md
index 6522494..202ab11 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Something like wget for downloading a file from MediaWiki sites (like Wikipedia
or Wikimedia Commons) using only the file name or the URL of its description
page.
-Requires Python 2.7 or 3.5+. Install with `pip install --user wikiget` or, if you're using
+Requires Python 3.5+. Install with `pip install --user wikiget` or, if you're using
[Homebrew](https://brew.sh/), `brew tap clpo13/wikiget && brew install wikiget`.
## Usage
@@ -60,14 +60,8 @@ like venv or [virtualenv](https://virtualenv.pypa.io/en/latest/)) to
install dependencies:
```bash
-git clone https://github.com/clpo13/wikiget.git # if you plan on submitting pull requests, fork the repo instead
+git clone https://github.com/clpo13/wikiget # if you plan on submitting pull requests, fork the repo instead
cd wikiget
-
-# Python 2 or 3
-pip install --user virtualenv
-virtualenv venv
-
-# Python 3
python3 -m venv venv
```
@@ -85,7 +79,7 @@ executable script. Unit tests can be run with `python setup.py test`.
## License
-Copyright (C) 2018, 2019 Cody Logan
+Copyright (C) 2018, 2019, 2020 Cody Logan
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/setup.py b/setup.py
index af030b3..ac03f3b 100644
--- a/setup.py
+++ b/setup.py
@@ -23,45 +23,55 @@ from os import path
from setuptools import setup, find_packages
here = path.abspath(path.dirname(__file__))
-with open(path.join(here, "README.md"), "r") as fr:
+with open(path.join(here, 'README.md'), 'r') as fr:
long_description = fr.read()
version = {}
-with open(path.join(here, "wikiget", "version.py"), "r") as fv:
+with open(path.join(here, 'wikiget', 'version.py'), 'r') as fv:
exec(fv.read(), version)
setup(
- name="wikiget",
- version=version["__version__"],
- author="Cody Logan",
- author_email="clpo13@gmail.com",
- description="CLI tool for downloading files from MediaWiki sites",
+ name='wikiget',
+ version=version['__version__'],
+ author='Cody Logan',
+ author_email='clpo13@gmail.com',
+ description='CLI tool for downloading files from MediaWiki sites',
long_description=long_description,
- long_description_content_type="text/markdown",
- url="https://github.com/clpo13/wikiget",
- keywords="download mediawiki wikimedia wikipedia",
+ long_description_content_type='text/markdown',
+ url='https://github.com/clpo13/wikiget',
+ keywords='commons download mediawiki wikimedia wikipedia',
packages=find_packages(),
classifiers=[
- "Development Status :: 4 - Beta",
- "Environment :: Console",
- "Intended Audience :: End Users/Desktop",
- "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
- "Operating System :: OS Independent",
- "Programming Language :: Python :: 2.7",
- "Programming Language :: Python :: 3.5",
- "Programming Language :: Python :: 3.6",
- "Programming Language :: Python :: 3.7",
- "Programming Language :: Python :: 3.8",
- "Topic :: Utilities",
+ 'Development Status :: 4 - Beta',
+ 'Environment :: Console',
+ 'Intended Audience :: End Users/Desktop',
+ 'License :: OSI Approved :: GNU General Public License v3 or later '
+ '(GPLv3+)',
+ 'Operating System :: OS Independent',
+ 'Programming Language :: Python',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 3 :: Only',
+ 'Programming Language :: Python :: 3.5',
+ 'Programming Language :: Python :: 3.6',
+ 'Programming Language :: Python :: 3.7',
+ 'Programming Language :: Python :: 3.8',
+ 'Topic :: Internet',
+ 'Topic :: Internet :: WWW/HTTP',
+ 'Topic :: Multimedia',
+ 'Topic :: Multimedia :: Graphics',
+ 'Topic :: Multimedia :: Sound/Audio',
+ 'Topic :: Multimedia :: Video',
+ 'Topic :: Utilities',
],
- python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*',
- install_requires=["future", "mwclient>=0.10.0", "pytest-runner", "requests", "tqdm"],
- tests_require=["pytest"],
+ python_requires='>=3.5',
+ install_requires=['future', 'mwclient>=0.10.0', 'pytest-runner',
+ 'requests', 'tqdm'],
+ tests_require=['pytest'],
project_urls={
- "Bug Reports": "https://github.com/clpo13/wikiget/issues",
+ 'Bug Reports': 'https://github.com/clpo13/wikiget/issues',
},
entry_points={
- "console_scripts": [
+ 'console_scripts': [
'wikiget=wikiget.wikiget:main',
],
},
diff --git a/wikiget/version.py b/wikiget/version.py
index d4bb133..789d392 100644
--- a/wikiget/version.py
+++ b/wikiget/version.py
@@ -1,3 +1,3 @@
"""Sets the program version in setup.py and on the command line."""
-__version__ = "0.3.0"
+__version__ = '0.4.0'