Merge pull request #464 from BrainPad/463

delete extra settings

.github/workflows/test.yaml

@@ -37,17 +37,12 @@ jobs:
           poetry run pytest --cov cliboa --cov-report term-missing --cov-report=xml
       - name: check layer dependency
         run: |
-          if [ ${{ matrix.python_versions }} = 3.6 ]; then
-            echo "import-linter does not support python${{ matrix.python_versions }}"
-          else
-            cd cliboa
-            poetry run lint-imports
-          fi
+          cd cliboa
+          poetry run lint-imports
       - name: execute bandit
         run: |
           if [ ${{ matrix.python_versions }} = 3.7 ]; then
             echo "bandit does not support python${{ matrix.python_versions }}"
           else
             poetry run bandit --severity-level high -r cliboa
           fi
-

.github/workflows/deploy.yaml → .github/workflows/upload_pypi.yaml

@@ -42,4 +42,4 @@ jobs:
           PYPI_PASSWORD=`jq -r '.inputs.password' $GITHUB_EVENT_PATH`
           echo ::add-mask::$PYPI_USERNAME
           echo ::add-mask::$PYPI_PASSWORD
-          sudo python3 tools/script/deploy_to_pypi.py $PYPI_USERNAME $PYPI_PASSWORD "${{ github.event.inputs.is_test }}"
+          sudo python3 tools/script/deploy_to_pypi.py $PYPI_USERNAME $PYPI_PASSWORD "${{ github.event.inputs.is_test }}"

cliboa/cli/cliboadmin.py

@@ -125,15 +125,12 @@ def _get_pipfile_and_pyproject_toml_path(self, cliboa_install_path):
         py_ver = py_ver_info[0].split(".")
         py_major_ver = py_ver[0] + "." + py_ver[1]
         py_major_ver_and_pyproject_toml = {
-            "3.6": "pyproject.above36.toml",
             "3.7": "pyproject.above37.toml",
             "3.8": "pyproject.above38.toml",
             "3.9": "pyproject.above39.toml",
             "3.10": "pyproject.above310.toml",
         }
         py_major_ver_and_pipfile = {
-            "3.5": "Pipfile.above35",
-            "3.6": "Pipfile.above36",
             "3.7": "Pipfile.above37",
             "3.8": "Pipfile.above38",
             "3.9": "Pipfile.above39",

setup.py

@@ -63,16 +63,16 @@ def read(filename):
     package_data={
         "cliboa.conf": ["logging.conf", "cliboa.ini"],
         "cliboa.template": [
-            "Pipfile.above36",
             "Pipfile.above37",
             "Pipfile.above38",
             "Pipfile.above39",
-            "pyproject.above36.toml",
+            "Pipfile.above310",
             "pyproject.above37.toml",
             "pyproject.above38.toml",
             "pyproject.above39.toml",
+            "pyproject.above310.toml",
         ],
     },
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     entry_points={"console_scripts": ["cliboadmin = cliboa.cli.cliboadmin:main"]},
 )

tools/docker/debian/Dockerfile

@@ -27,9 +27,6 @@ RUN apt update -y && \
 
 # Download multiple python versions which cliboa supports
 RUN cd /usr/local/ && \
-    wget https://www.python.org/ftp/python/3.6.9/Python-3.6.9.tgz && \
-    tar -xzvf Python-3.6.9.tgz && \
-    rm -rf Python-3.6.9.tgz && \
     wget https://www.python.org/ftp/python/3.8.11/Python-3.8.11.tgz && \
     tar -xzvf Python-3.8.11.tgz && \
     rm -rf Python-3.8.11.tgz && \
@@ -38,10 +35,6 @@ RUN cd /usr/local/ && \
     rm -rf Python-3.9.6.tgz
 
 # Build multiple python versions which cliboa supports
-RUN cd /usr/local/Python-3.6.9 && \
-    ./configure --prefix=/usr/local/bin/python3.6 && \
-    make && \
-    make altinstall
 RUN cd /usr/local/Python-3.8.11 && \
     ./configure --prefix=/usr/local/bin/python3.8 && \
     make && \

tools/script/init_dev.py

@@ -9,14 +9,12 @@
 """
 py_major_version = "{}.{}".format(sys.version_info.major, sys.version_info.minor)
 py_major_version_and_pipfile = {
-    "3.6": "Pipfile.above36",
     "3.7": "Pipfile.above37",
     "3.8": "Pipfile.above38",
     "3.9": "Pipfile.above39",
     "3.10": "Pipfile.above310",
 }
 py_major_version_and_pyproject_toml = {
-    "3.6": "pyproject.above36.toml",
     "3.7": "pyproject.above37.toml",
     "3.8": "pyproject.above38.toml",
     "3.9": "pyproject.above39.toml",