Merge branch 'master' into allow-typing

.github/workflows/workflow.yml

@@ -1,13 +1,18 @@
-name: workflow
-on: push
+name: Workflow
+
+on:
+ push:
+ branches:
+ - master
+ - main
 
 defaults:
  run:
  working-directory: ../../main
 
 jobs:
  unittest:
- if: contains(github.event.head_commit.message, '[CI SKIP]') == false && contains(github.event.head_commit.message, '[CI AUTO]') == false && github.ref == 'refs/heads/master'
+ if: contains(github.event.head_commit.message, '[CI SKIP]') == false && contains(github.event.head_commit.message, '[CI AUTO]') == false
  runs-on: ${{ matrix.os }}
  strategy:
  matrix:
@@ -18,25 +23,30 @@ jobs:
  working-directory: ../../
  run: mkdir main
  - name: Set up Git SSH
- uses: webfactory/ssh-agent@v0.5.3
+ uses: webfactory/ssh-agent@v0.7.0
  with:
  ssh-private-key: ${{ secrets.GIT_SSH }}
  - name: Set up python version ${{ matrix.python-version }}
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
  with:
  python-version: '${{ matrix.python-version }}'
- - name: Clone 8 repos
+ - name: Install necessities
  run: |
+ python -m pip install --upgrade pip
+ pip install --upgrade setuptools wheel twine
+ - name: Clone 6 repos
+ run: |
+ mkdir repos
+ cd repos
  git clone ssh:https://[email protected]/ManderaGeneral/generalimport.git
  git clone ssh:https://[email protected]/ManderaGeneral/generaltool.git
  git clone ssh:https://[email protected]/ManderaGeneral/generallibrary.git
  git clone ssh:https://[email protected]/ManderaGeneral/generalfile.git
  git clone ssh:https://[email protected]/ManderaGeneral/generalvector.git
  git clone ssh:https://[email protected]/ManderaGeneral/generalpackager.git
- git clone ssh:https://[email protected]/Mandera/Mandera.git
- git clone ssh:https://[email protected]/ManderaGeneral/.github.git
  - name: Install 6 repos
  run: |
+ cd repos
  pip install -e generalimport[full]
  pip install -e generaltool[full]
  pip install -e generallibrary[full]
@@ -45,6 +55,7 @@ jobs:
  pip install -e generalpackager[full]
  - name: Run Packager method 'workflow_unittest'
  run: |
+ cd repos
  python -c "from generalpackager import Packager; Packager().workflow_unittest()"
  env:
  GH_TOKEN: ${{ secrets.PACKAGER_GITHUB_API }}
@@ -58,15 +69,21 @@ jobs:
  working-directory: ../../
  run: mkdir main
  - name: Set up Git SSH
- uses: webfactory/ssh-agent@v0.5.3
+ uses: webfactory/ssh-agent@v0.7.0
  with:
  ssh-private-key: ${{ secrets.GIT_SSH }}
  - name: Set up python version 3.11
- uses: actions/setup-python@v2
+ uses: actions/setup-python@v4
  with:
  python-version: '3.11'
+ - name: Install necessities
+ run: |
+ python -m pip install --upgrade pip
+ pip install --upgrade setuptools wheel twine
  - name: Clone 8 repos
  run: |
+ mkdir repos
+ cd repos
  git clone ssh:https://[email protected]/ManderaGeneral/generalimport.git
  git clone ssh:https://[email protected]/ManderaGeneral/generaltool.git
  git clone ssh:https://[email protected]/ManderaGeneral/generallibrary.git
@@ -77,6 +94,7 @@ jobs:
  git clone ssh:https://[email protected]/ManderaGeneral/.github.git
  - name: Install 6 repos
  run: |
+ cd repos
  pip install -e generalimport[full]
  pip install -e generaltool[full]
  pip install -e generallibrary[full]
@@ -85,8 +103,10 @@ jobs:
  pip install -e generalpackager[full]
  - name: Run Packager method 'workflow_sync'
  run: |
+ cd repos
  python -c "from generalpackager import Packager; Packager().workflow_sync()"
  env:
  GH_TOKEN: ${{ secrets.PACKAGER_GITHUB_API }}
  TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
  TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+

.github/workflows/workflow_dev.yml

@@ -0,0 +1,46 @@
+name: WorkflowDev
+
+on:
+ push:
+ branches-ignore:
+ - master
+ - main
+
+defaults:
+ run:
+ working-directory: ../../main
+
+jobs:
+ dev_unittest:
+ if: contains(github.event.head_commit.message, '[CI SKIP]') == false && contains(github.event.head_commit.message, '[CI AUTO]') == false
+ runs-on: ${{ matrix.os }}
+ strategy:
+ matrix:
+ python-version: ['3.8', '3.9', '3.10', '3.11']
+ os: [windows-latest, ubuntu-latest]
+ steps:
+ - name: Create folder
+ working-directory: ../../
+ run: mkdir main
+ - name: Set up python version ${{ matrix.python-version }}
+ uses: actions/setup-python@v4
+ with:
+ python-version: '${{ matrix.python-version }}'
+ - name: Install necessities
+ run: |
+ python -m pip install --upgrade pip
+ pip install --upgrade setuptools wheel twine
+ - name: Clone 1 repo
+ run: |
+ mkdir repos
+ cd repos
+ git clone https://github.com/${{ github.repository_owner }}/generalimport.git -b ${{ github.ref_name }} || git clone https://github.com/${{ github.repository_owner }}/generalimport.git || git clone https://github.com/ManderaGeneral/generalimport.git -b ${{ github.ref_name }} || git clone https://github.com/ManderaGeneral/generalimport.git
+ - name: Install 1 repo
+ run: |
+ cd repos
+ pip install -e generalimport[full]
+ - name: Run unittests
+ run: |
+ cd repos/generalimport/generalimport/test
+ python -m unittest discover
+

.gitignore

@@ -0,0 +1,80 @@
+__pycache__/
+*.py[cod]
+*$py.class
+*.so
+celerybeat-schedule
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+docs/pydoc/temp/
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+instance/
+.webassets-cache
+pip-log.txt
+pip-delete-this-directory.txt
+profile_default/
+ipython_config.py
+.ipynb_checkpoints
+.git/
+**test/tests/
+PKG-INFO/
+setup.cfg
+node_modules/
+.parcel-cache
+/site
+.mypy_cache/
+.dmypy.json
+dmypy.json
+#Pipfile.locktarget/
+.idea/
+.python-version
+__pypackages__/
+*.manifest
+*.spec
+.pyre/
+.ropeproject
+*.sage.py
+.scrapy
+.spyderproject
+.spyproject
+*.mo
+*.pot
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+.vscode