Merge pull request #565 from icon-project/hotfix/update-requires-on-m…

…akefile

Update requires compatible on Makefile

.github/workflows/citizen.yml

@@ -42,18 +42,24 @@ jobs:
         cd -
         icon_rc -version
 
-    - name: Install Loopchain
+    - if: ${{ github.base_ref == 'master' }}
+      name: Install Loopchain master
       run: |
         pwd
-        make develop
+        make install
 
+    - if: ${{ github.base_ref != 'master' }}
+      name: Install Loopchain develop
+      run: |
+        pwd
+        make develop
     - name: Generate-key
       run: |
-        sed "23 a\  \"PRIVATE_PASSWORD\": \"${pwd}\"," -i conf/mainnet/loopchain_conf.json
+        sed "23 a\  \"PRIVATE_PASSWORD\": \"${PWD}\"," -i conf/mainnet/loopchain_conf.json
         cat conf/mainnet/loopchain_conf.json
 
-        pip install tbears
-        tbears keystore -p ${pwd} my_keystore.json
+        python -c "import os; from iconsdk.wallet.wallet import KeyWallet; \
+          KeyWallet.create().store('my_keystore.json', os.getenv('PWD'))"
       env:
         pwd: Most_safest_pw_in_the_wor1d
 

.github/workflows/unit_test.yml

@@ -16,7 +16,7 @@ jobs:
         echo "::set-env name=PR_PATH::https://github.com/${GITHUB_REPOSITORY}/pull/${pr_num}"
 
     - name: Setup Python
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v2
       with:
         python-version: 3.7
 

Makefile

@@ -40,9 +40,9 @@ requirements:
 all: install generate-key
 
 requires:
-	$(PIP_INSTALL) iconservice==1.7.0
-	$(PIP_INSTALL) iconrpcserver==1.5.0
-	$(PIP_INSTALL) tbears
+	$(PIP_INSTALL) iconservice~=1.7.0
+	$(PIP_INSTALL) iconrpcserver~=1.5.0
+	$(PIP_INSTALL) iconsdk~=1.3.0
 
 ## pip install packages
 install: $(INSTALL_REQUIRES)
@@ -64,7 +64,8 @@ generate-proto:
 ## Generate a key
 generate-key:
 	@file="my_keystore.json"; $(RM) $${file} > /dev/null; \
-	tbears keystore $${file}; \
+	python -c "import getpass; from iconsdk.wallet.wallet import KeyWallet; \
+		KeyWallet.create().store('$${file}', getpass.getpass('Input your keystore password: '))"; \
 	cat $${file}
 
 ## Check loopchain & gunicorn & rabbitmq processes

setup.py

@@ -67,7 +67,7 @@ def run(self):
     'setup_requires': setup_requires,
     'install_requires': install_requires,
     'extras_require': {
-        'tests': ['iconsdk==1.1.0', 'pytest>=4.6.3', 'pytest-xprocess>=0.12.1', "pytest-benchmark", "pytest-mock",
+        'tests': ['iconsdk~=1.3.0', 'pytest>=4.6.3', 'pytest-xprocess>=0.12.1', "pytest-benchmark", "pytest-mock",
                   "pytest-asyncio", "freezegun"],
     },
     'entry_points': {