Merge branch 'dev'

README.md

@@ -133,7 +133,7 @@ You can also use versions less than v0.5.1, which retains legacy support for the
 * Edit the files on your fork/branch
     * If your git client complains about committing to master, just remove `.pre-commit-config.yaml`
 * Run tests with `pytest testing/ -vvvv -l -s --icat`
-* Try it with `python koneko/main.py`, or `python setup.py install` then `koneko` to simulate a pip install (or `pip install .`; check out [manual installation](#manual-installation))
+* Try it with `python setup.py install` then `koneko` to simulate a pip install (or `pip install .`; check out [manual installation](#manual-installation))
     * If doing the latter, make sure you aren't running the released version on pypi (totally didn't happen to me).
 * Submit a pull request
 * If you want to, you can create an issue first. Ask any questions by opening a new issue.
@@ -236,6 +236,8 @@ Run `pytest testing/ -vvvv -l -s --icat`. If icat fails, skip the three offendin
 ## Upload to PyPI
 When test installing with pip, don't forget to use `pip install .` or `python setup.py install`, not `pip install koneko` (which will grab from latest stable version). (Yes, I made the same mistake again)
 
+**Warning:** you *must* test installing with both `pip install .` and `python setup.py install`.
+
 Bump version info in `__init__.py`, `setup.py`, and `README.md`
 
 ```sh

koneko/koneko/api.py

@@ -6,7 +6,7 @@
 import funcy
 from pixivpy3 import PixivError, AppPixivAPI
 
-from koneko import pure
+from koneko.koneko import pure
 
 
 class APIHandler:

koneko/koneko/cli.py

@@ -36,7 +36,7 @@
 
 from docopt import docopt
 
-from koneko import pure
+from koneko.koneko import pure
 
 
 def process_cli_args():

koneko/koneko/data.py

@@ -1,7 +1,7 @@
 """Stores json data from the api. Acts as frontend to access data in a single line.
 Functionally pure, no side effects (but stores state)
 """
-from koneko import KONEKODIR, pure
+from koneko.koneko import KONEKODIR, pure
 
 
 class GalleryJson:

koneko/koneko/download.py

@@ -5,7 +5,7 @@
 
 import cytoolz
 
-from koneko import api, pure, utils
+from koneko.koneko import api, pure, utils
 
 
 @pure.spinner('')

koneko/koneko/lscat.py

@@ -6,8 +6,8 @@
 from pixcat import Image
 from blessed import Terminal
 
-from koneko.pure import cd
-from koneko import utils
+from koneko.koneko.pure import cd
+from koneko.koneko import utils
 
 TERM = Terminal()
 

koneko/koneko/prompt.py

@@ -5,7 +5,7 @@
 
 from blessed import Terminal
 
-from koneko import ui, pure, colors
+from koneko.koneko import ui, pure, colors
 
 TERM = Terminal()
 

koneko/koneko/ui.py

@@ -8,7 +8,7 @@
 
 from tqdm import tqdm
 
-from koneko import (KONEKODIR, api, data, pure, lscat, utils, colors, prompt,
+from koneko.koneko import (KONEKODIR, api, data, pure, lscat, utils, colors, prompt,
                     download)
 
 

koneko/koneko/utils.py

@@ -8,7 +8,7 @@
 
 import pixcat
 
-from koneko import KONEKODIR, ui, cli, pure, __version__
+from koneko.koneko import KONEKODIR, ui, cli, pure, __version__
 
 
 def verify_full_download(filepath):

testing/test_data.py

@@ -10,7 +10,7 @@
 sys.path.append('../koneko/koneko')
 sys.path.append('testing')
 
-from koneko import pure, lscat, utils, data, KONEKODIR
+from koneko.koneko import pure, lscat, utils, data, KONEKODIR
 from page_json import *  # Imports the current_page (dict) stored in disk
 
 page_illusts = page_json["illusts"]

testing/test_lscat.py

@@ -8,7 +8,7 @@
 sys.path.append('../koneko/koneko')
 sys.path.append('testing')
 
-from koneko import lscat
+from koneko.koneko import lscat
 
 def test_xcoords():
     assert lscat.xcoords(100) == [2, 20, 38, 56, 74]
@@ -34,7 +34,7 @@ def __init__(self):
             self.download_path = Path('testing/files/')
 
     # This config has noprint = False
-    monkeypatch.setattr('koneko.utils.Path.expanduser',
+    monkeypatch.setattr('koneko.koneko.utils.Path.expanduser',
                         lambda x: Path('example_config.ini'))
 
     fakedata = FakeData()

testing/test_pure.py

@@ -8,7 +8,7 @@
 sys.path.append('../koneko/koneko')
 sys.path.append('testing')
 
-from koneko import pure, lscat, utils, data, KONEKODIR
+from koneko.koneko import pure, lscat, utils, data, KONEKODIR
 from page_json import *  # Imports the current_page (dict) stored in disk
 
 page_illusts = page_json["illusts"]

testing/test_utils.py

@@ -9,7 +9,7 @@
 sys.path.append('../koneko/koneko')
 sys.path.append('testing')
 
-from koneko import utils
+from koneko.koneko import utils
 
 @pytest.fixture
 def turn_off_print(monkeypatch):
@@ -58,15 +58,15 @@ def test_info_screen_loop(monkeypatch):
     os.system("kitty +kitten icat --clear")
 
 def test_check_noprint(monkeypatch):
-    monkeypatch.setattr("koneko.utils.get_settings", lambda x, y: "on")
+    monkeypatch.setattr("koneko.koneko.utils.get_settings", lambda x, y: "on")
     assert utils.check_noprint() == True
-    monkeypatch.setattr("koneko.utils.get_settings", lambda x, y: "off")
+    monkeypatch.setattr("koneko.koneko.utils.get_settings", lambda x, y: "off")
     assert utils.check_noprint() == False
-    monkeypatch.setattr("koneko.utils.get_settings", lambda x, y: "false")
+    monkeypatch.setattr("koneko.koneko.utils.get_settings", lambda x, y: "false")
     assert utils.check_noprint() == False
 
     # Test with an actual cfg
-    monkeypatch.setattr('koneko.utils.Path.expanduser',
+    monkeypatch.setattr('koneko.koneko.utils.Path.expanduser',
                         lambda x: Path('example_config.ini'))
     assert utils.check_noprint() == False
 
@@ -77,7 +77,7 @@ def test_noprint(capsys):
 
 def test_get_settings(monkeypatch):
     # Redivert the config path
-    monkeypatch.setattr('koneko.utils.Path.expanduser',
+    monkeypatch.setattr('koneko.koneko.utils.Path.expanduser',
                         lambda x: Path('example_config.ini'))
 
     assert utils.get_settings('Credentials', 'username') == 'koneko'
@@ -89,7 +89,7 @@ def test_get_settings(monkeypatch):
 def test_config(monkeypatch):
     # If config exists
     example_path = Path('example_config.ini')
-    monkeypatch.setattr('koneko.utils.Path.expanduser', lambda x: example_path)
+    monkeypatch.setattr('koneko.koneko.utils.Path.expanduser', lambda x: example_path)
 
     creds, your_id = utils.config()
     assert your_id == '1234'
@@ -101,12 +101,12 @@ def test_config(monkeypatch):
     if test_cfg_path.exists():
         os.system(f'rm {test_cfg_path}')
 
-    monkeypatch.setattr('koneko.utils.Path.expanduser', lambda x: test_cfg_path)
+    monkeypatch.setattr('koneko.koneko.utils.Path.expanduser', lambda x: test_cfg_path)
 
     # It asks for multiple inputs: username, whether to save user id, user id
     responses = iter(['myusername', 'y', 'myid'])
     monkeypatch.setattr('builtins.input', lambda x=None: next(responses))
-    monkeypatch.setattr('koneko.utils.getpass', lambda: 'mypassword')
+    monkeypatch.setattr('koneko.koneko.utils.getpass', lambda: 'mypassword')
 
     creds, your_id = utils.config()
     assert your_id == 'myid'