Skip to content

Commit f695032

Browse files
committed
fix loading of credentials + storing of 5 favourite packages + release 1.0.0
1 parent 15c5ed5 commit f695032

File tree

2 files changed

+76
-5
lines changed

2 files changed

+76
-5
lines changed

fastpypi/fastpypi_core.py

+75-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import os
22
import dogui.dogui_core as dg
3-
from keepvariable.keepvariable_core import Var,kept_variables,save_variables,load_variable
4-
3+
from keepvariable.keepvariable_core import KeepVariableDummyRedisServer
54

5+
kv_redis=KeepVariableDummyRedisServer()
66

77
def load_setup_py():
88
"""Checks whether there is already a setup file for given package"""
@@ -130,7 +130,8 @@ def create_package():
130130
def upload_to_pypi():
131131

132132
try:
133-
with open("fastpypi/credentials.ini", "r") as file:
133+
134+
with open(fastpypi_dir+"/credentials.ini", "r") as file:
134135
rows=file.readlines()
135136
print(rows)
136137
PYPI_USERNAME=rows[0].split("=")[1].strip()
@@ -148,14 +149,68 @@ def upload_to_pypi():
148149

149150
def change_directory():
150151
new_dir=entry6.text.get()
152+
try:
153+
os.chdir(fastpypi_dir) #to store favourite packages
154+
favourite_packages=kv_redis.get("fastpypi_favourite_packages")
155+
print("FAV1",favourite_packages)
156+
157+
if favourite_packages is None:
158+
favourite_packages=[]
159+
print("FAV2",favourite_packages)
160+
161+
if new_dir is not None and new_dir not in favourite_packages:
162+
favourite_packages.append(new_dir)
163+
print("FAV3",favourite_packages)
164+
165+
kv_redis.set("fastpypi_favourite_packages",favourite_packages)
166+
print("Storing",favourite_packages)
167+
except Exception as e:
168+
print("Warning - Fastpypi: favourite package was not stored in kv_redis",e)
169+
151170
os.chdir(new_dir)
152-
new_dir=label21.text.set(new_dir)
171+
label21.text.set(new_dir)
172+
print(os.getcwd())
153173

174+
175+
def change_directory_to_favourite1():
176+
new_dir=favourite_packages[0]
177+
os.chdir(new_dir)
178+
label21.text.set(new_dir)
154179
print(os.getcwd())
180+
load_setup_py()
155181

182+
def change_directory_to_favourite2():
183+
new_dir=favourite_packages[1]
184+
os.chdir(new_dir)
185+
label21.text.set(new_dir)
186+
print(os.getcwd())
187+
load_setup_py()
188+
189+
def change_directory_to_favourite3():
190+
new_dir=favourite_packages[2]
191+
os.chdir(new_dir)
192+
label21.text.set(new_dir)
193+
print(os.getcwd())
194+
load_setup_py()
195+
196+
def change_directory_to_favourite4():
197+
new_dir=favourite_packages[3]
198+
os.chdir(new_dir)
199+
label21.text.set(new_dir)
200+
print(os.getcwd())
201+
load_setup_py()
202+
203+
def change_directory_to_favourite5():
204+
new_dir=favourite_packages[4]
205+
os.chdir(new_dir)
206+
label21.text.set(new_dir)
207+
print(os.getcwd())
208+
load_setup_py()
209+
156210

157211

158212
current_dir=os.getcwd()
213+
fastpypi_dir=os.getcwd()
159214
gui1=dg.GUI("Easy PyPI Tool")
160215

161216
label1=dg.Label(gui1.window,"Package name",3,1)
@@ -188,6 +243,22 @@ def change_directory():
188243

189244

190245

246+
247+
248+
249+
favourite_packages=kv_redis.get("fastpypi_favourite_packages")
250+
print("FAV",favourite_packages)
251+
252+
change_directory_to_favourite_function_list=[change_directory_to_favourite1, change_directory_to_favourite2, change_directory_to_favourite3, change_directory_to_favourite4, change_directory_to_favourite5]
253+
if favourite_packages is not None:
254+
for i in range(min(5, len(favourite_packages))):
255+
256+
dg.Label(gui1.window,"Favourite package "+str(i)+":",10+i,1)
257+
favourite_package_btn1=dg.Button(gui1.window,"Chdir and load setup: "+str(favourite_packages[i]),change_directory_to_favourite_function_list[i],10+i,2)
258+
259+
260+
261+
191262
label6=dg.Label(gui1.window,"Current directory:",1,1)
192263

193264
label21=dg.Label(gui1.window,current_dir,1,2)

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name='fastpypi',
8-
version='0.1.2',
8+
version='1.0.0',
99
author='DovaX',
1010
author_email='[email protected]',
1111
description='A package enabling user to create and update existing PyPI packages in an easy-to-use gui.',

0 commit comments

Comments
 (0)