No code changes, just info updation

Updated version Updated changelog Updated TravisCI Build config with new Pypi token info Updated setup.py file Added "venv" to be ignored.
Xonshiz · Jun 13, 2021 · 7c93412 · 7c93412
1 parent fb9e55f
commit 7c93412
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -103,3 +103,8 @@ comic_dl/config.json*
 comic_dl/build/__main__/localpycos/struct.pyo
 comic_dl/__main__.spec,old
 comic_dl/build/__main__/warn-__main__.txt
+venv/*
+build/*
+dist/*
+comic_dl/build/*
+comic_dl/dist/*
diff --git a/.travis.yml b/.travis.yml
@@ -17,9 +17,8 @@ matrix:
         - provider: pypi
           edge:
             branch: v1.8.45
-          username: xonshiz
-          password:
-            secure: lHfaeruvQM4QL3hk1+wSwVSNjkeQH153X9Oi+nY1SaahjEg1l9mNaubfq7l8mNRgbZzW3yOHswDOLz6bNlSKX9xnjecl/5jVOg97ImChujtwZobGmCJuSBq+F2HGt3KnJefjgv2E/kAMgKPLJJSZHIGzxaYDLyRiz8hr6aMdPFEU8rY8Ha4OpHOCjQrZOULgUYQs/UR2FzjI6QhIqHOlc+reZbtADI9Z69i16iTXf+isAFgwEW+Na/uxODT3kXgt5HXxNayODPlMCVBABfWyDajoeJFmYE90hggPI3FmBn9rapTEIJMMDhT5Sh/T7lIVgyJGBA6eT4lBiEPgB4CS8Vbh6nW00RjrgYWMDPMpxqNA3hBCRsQ1zpOQc5idH8yxS2Y+7GxwWqcqmGiuvE0/a0ytU5vDeM+VkjSN1irFEW1tAPjMNHLK8aPDDteu0qCyhDK17W4NOuZ8DQgxjvPwsSIElQOTnEy4UdXNkcQa8rnPIHnHa0ceoOZI1gYdn/xlrKcmXmGSGCi4KBpo1bQ1fC6QnHleKsognpNAr4diJxgqDjRMUmcfQOWW8c2hji2xUH34amvVMZVpbJu1zkM/o8I7upaAjwE6H/s7Azo2X/sKYyH0uJDeWYrTHofp9M3yWJKJQ3/nqzG8Ete9caZBbKcj0pb6RXdJ8iAR4JLUDJE=
+          username: __token__
+          password: $PYPI_TOKEN
           distributions: "sdist bdist_wheel"
           on:
             branch: master
@@ -106,15 +105,15 @@ matrix:
       language: sh
       python: "3.8"
       before_install:
-        - python3 --version
-        - python3 -m pip install --upgrade pip
+        - python --version
+        - python -m pip install --upgrade pip
       install:
         - "pip install  -r requirements.txt"
         - "pip uninstall -y enum34"
         - "pip install pyinstaller"
       script:
         - cd comic_dl
-        - python3 __main__.py --version
+        - python __main__.py --version
         - pyinstaller --onefile --hidden-import=queue "__main__.py"  -n "comic_dl_osx"
         - export huluVersion=`cat version.txt`
         - cd ..

diff --git a/Changelog.md b/Changelog.md
@@ -115,4 +115,5 @@
 - PR Merge for #172  [2018.09.24]
 - PR Merge for #189   [2018.11.05]
 - PR Merge for #199   [2018.11.27]
-- All PRs Merged [2019.05.26]
+- All PRs Merged [2019.05.26]
+- All PRs Merged [2021.06.13]
diff --git a/comic_dl/__version__.py b/comic_dl/__version__.py
@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = "2019.05.26"
+__version__ = "2021.06.13"
diff --git a/docs/Changelog.md b/docs/Changelog.md
@@ -115,4 +115,5 @@
 - PR Merge for #172  [2018.09.24]
 - PR Merge for #189   [2018.11.05]
 - PR Merge for #199   [2018.11.27]
-- All PRs Merged [2019.05.26]
+- All PRs Merged [2019.05.26]
+- All PRs Merged [2021.06.13]
diff --git a/setup.py b/setup.py
@@ -1,39 +1,26 @@
-from distutils.core import setup
+import setuptools
+
+from comic_dl import __version__
 
 readme = open('ReadMe.md').read()
 history = open('Changelog.md').read()
 
-setup(
-  name = 'comic_dl',
-  packages = ['comic_dl','comic_dl.sites', 'comic_dl.manga_eden'], # this must be the same as the name above
-  install_requires=["selenium",
-                      "requests",
-                      "more_itertools",
-                      "cloudscraper",
-                      "bs4"
-    ],
-  version = '2018.01.10',
-  description = 'Comic-dl is a command line tool to download Comics and Manga from various Manga and Comic sites easily.',
-  long_description=readme + '\n\n' + history,
-  author = 'Xonshiz',
-  author_email = 'xonshiz@psychoticelites.com',
-  url='https://github.com/Xonshiz/comic-dl',
-  download_url = 'https://codeload.github.com/Xonshiz/comic-dl/tar.gz/2018.1.10',
-  keywords = ['comic-dl', 'cli', 'comic downloader','manga downloader','mangafox','batoto','kissmanga','comic naver','readcomiconline'],
-  classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Environment :: Console',
-        'Intended Audience :: End Users/Desktop',
-        'License :: Public Domain',
-        'Natural Language :: English',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Operating System :: OS Independent',
-        'Topic :: Multimedia :: Graphics'
+setuptools.setup(
+    name="comic_dl", # Replace with your own username
+    version=__version__.__version__,
+    author="Xonshiz",
+    author_email='xonshiz@gmail.com',
+    url='https://github.com/Xonshiz/comic-dl',
+    download_url='https://github.com/Xonshiz/comic-dl/releases/latest',
+    description="Comic-dl is a command line tool to download Comics and Manga from various Manga and Comic sites easily.",
+    long_description='{0}\n\n{1}'.format(readme, history),
+    long_description_content_type="text/markdown",
+    packages=setuptools.find_packages(),
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "License :: OSI Approved :: MIT License",
+        "Operating System :: OS Independent",
     ],
+    python_requires='>=3.0',
 )
+