diff --git a/.activate.sh b/.activate.sh deleted file mode 120000 index 9308d33..0000000 --- a/.activate.sh +++ /dev/null @@ -1 +0,0 @@ -venv/bin/activate \ No newline at end of file diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 14129ec..0000000 --- a/.coveragerc +++ /dev/null @@ -1,14 +0,0 @@ -[run] -parallel = True -branch = True -data_file = .coverage -source = - cli - fluffy - tests - testing -omit = - cli/setup.py - -[report] -show_missing = True diff --git a/.deactivate.sh b/.deactivate.sh deleted file mode 100644 index d1898d7..0000000 --- a/.deactivate.sh +++ /dev/null @@ -1 +0,0 @@ -deactivate diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index d578e40..0000000 --- a/.dockerignore +++ /dev/null @@ -1,8 +0,0 @@ -venv -.git -.tox -*.swp -playground -*.pyc -/testing -/tests diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3999eb7..417a148 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -1,20 +1,11 @@ name: CI on: push: - branches: - - main pull_request: jobs: build-and-test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.11' - - name: Install dependencies - run: | - pip install virtualenv - make minimal - name: Run tests run: make test diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml deleted file mode 100644 index b9355de..0000000 --- a/.github/workflows/publish.yaml +++ /dev/null @@ -1,44 +0,0 @@ -name: Publish to PyPI -on: - push: - tags: - - v* -jobs: - build-and-publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v4 - with: - python-version: '3.11' - - name: Install dependencies - run: pip install virtualenv build - - name: Build assets - run: make assets - - name: Upload assets - run: | - ln -s settings/prod_s3.py settings.py - echo y | make upload-assets - rm settings.py - env: - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: us-west-1 - - name: Build Python artifacts - run: python -m build --sdist --wheel --outdir dist - - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@release/v1 - with: - password: ${{ secrets.PYPI_TOKEN }} - skip-existing: true - - name: Login to GitHub Container Registry - uses: docker/login-action@v2 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push Docker image - uses: docker/build-push-action@v4 - with: - tags: 'ghcr.io/chriskuehl/fluffy-server:latest,ghcr.io/chriskuehl/fluffy-server:${{ github.ref_name }}' - push: true diff --git a/.gitignore b/.gitignore index 27d3df9..124c326 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,3 @@ -*.egg -*.egg-info -*.py[cod] -/*.build -/*.buildinfo -/*.changes -/*.deb -/.coverage -/.coverage.* -/.pytest_cache -/.tox -/build /dist -/fluffy/static/**/*.hash -/fluffy/static/app.css -/fluffy/static/pygments.css -/settings.py /server/static/app.css /server/static/app.css.map -/tmp -/venv diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index a8e5bc7..0000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,40 +0,0 @@ -repos: -- repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.6.0 - hooks: - - id: check-added-large-files - - id: check-docstring-first - - id: check-executables-have-shebangs - - id: check-json - - id: check-merge-conflict - - id: check-xml - - id: check-yaml - - id: debug-statements - - id: detect-private-key - - id: double-quote-string-fixer - - id: end-of-file-fixer - - id: name-tests-test - - id: requirements-txt-fixer - - id: trailing-whitespace -- repo: https://github.com/pycqa/flake8 - rev: 7.1.1 - hooks: - - id: flake8 -- repo: https://github.com/hhatto/autopep8 - rev: v2.3.1 - hooks: - - id: autopep8 -- repo: https://github.com/asottile/reorder-python-imports - rev: v3.13.0 - hooks: - - id: reorder-python-imports -- repo: https://github.com/asottile/add-trailing-comma - rev: v3.1.0 - hooks: - - id: add-trailing-comma - args: [--py36-plus] -- repo: https://github.com/asottile/pyupgrade - rev: v3.17.0 - hooks: - - id: pyupgrade - args: [--py310-plus] diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index c5a76df..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,3 +0,0 @@ -include requirements-minimal.txt -recursive-include fluffy/static * -recursive-include fluffy/templates * diff --git a/requirements-dev-minimal.txt b/requirements-dev-minimal.txt deleted file mode 100644 index ee45ec9..0000000 --- a/requirements-dev-minimal.txt +++ /dev/null @@ -1,10 +0,0 @@ -coverage -coverage-enable-subprocess -ephemeral-port-reserve -gunicorn -libsass -pre-commit>=1.0 -pytest -requests -requirements-tools -twine diff --git a/requirements-dev.txt b/requirements-dev.txt deleted file mode 100644 index 91861b0..0000000 --- a/requirements-dev.txt +++ /dev/null @@ -1,46 +0,0 @@ -attrs==21.4.0 -bleach==5.0.1 -certifi==2023.5.7 -cffi==1.15.0 -cfgv==3.3.1 -charset-normalizer==3.1.0 -commonmark==0.9.1 -coverage==6.3.2 -coverage-enable-subprocess==1.0 -cryptography==36.0.2 -distlib==0.3.4 -docutils==0.18.1 -ephemeral-port-reserve==1.1.4 -filelock==3.6.0 -gunicorn==20.1.0 -idna==3.4 -importlib-metadata==6.6.0 -iniconfig==1.1.1 -jeepney==0.8.0 -keyring==23.5.0 -libsass==0.21.0 -nodeenv==1.6.0 -packaging==21.3 -pkginfo==1.8.2 -platformdirs==2.5.1 -pluggy==1.0.0 -pre-commit==2.18.1 -py==1.11.0 -pycparser==2.21 -pyparsing==3.0.8 -pytest==7.1.1 -PyYAML==6.0 -readme-renderer==34.0 -requests==2.30.0 -requests-toolbelt==0.9.1 -requirements-tools==2.0.0 -rfc3986==2.0.0 -rich==12.2.0 -SecretStorage==3.3.1 -setuptools==67.7.2 -toml==0.10.2 -tomli==2.0.1 -twine==4.0.0 -virtualenv==20.14.1 -webencodings==0.5.1 -zipp==3.15.0 diff --git a/requirements-minimal.txt b/requirements-minimal.txt deleted file mode 100644 index 541faed..0000000 --- a/requirements-minimal.txt +++ /dev/null @@ -1,11 +0,0 @@ -boto3 -cached_property -csscompressor -flask -identify -# https://github.com/chriskuehl/fluffy/issues/126 -mistune<0.999 -pygments -pygments-ansi-color>=0.0.3 -pygments-solarized-style -pyquery diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 321c305..0000000 --- a/requirements.txt +++ /dev/null @@ -1,23 +0,0 @@ -boto3==1.21.37 -botocore==1.24.37 -cached-property==1.5.2 -click==8.1.2 -csscompressor==0.9.5 -cssselect==1.1.0 -Flask==2.1.1 -identify==2.4.12 -itsdangerous==2.1.2 -Jinja2==3.1.1 -jmespath==1.0.0 -lxml==4.9.2 -MarkupSafe==2.1.1 -mistune==0.8.4 -Pygments==2.11.2 -pygments-ansi-color==0.0.6 -pygments-solarized-style==0.1 -pyquery==1.4.3 -python-dateutil==2.8.2 -s3transfer==0.5.2 -six==1.15.0 -urllib3==1.26.9 -Werkzeug==2.1.1 diff --git a/setup.py b/setup.py deleted file mode 100644 index 9aeb36d..0000000 --- a/setup.py +++ /dev/null @@ -1,33 +0,0 @@ -from setuptools import find_packages -from setuptools import setup - -from fluffy import version - - -with open('requirements-minimal.txt') as f: - minimal_reqs = f.read().splitlines() - - -setup( - name='fluffy-server', - version=version, - author='Chris Kuehl', - author_email='ckuehl@ckuehl.me', - packages=find_packages(exclude=('test*',)), - include_package_data=True, - install_requires=minimal_reqs, - license='Apache License 2.0', - long_description_content_type='text/markdown', - classifiers=( - 'License :: OSI Approved :: Apache Software License', - 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - ), - python_requires='>=3.10', - entry_points={ - 'console_scripts': [ - 'fluffy-upload-assets = fluffy.component.assets:upload_assets', - ], - }, -) diff --git a/tmp/html/.gitignore b/tmp/html/.gitignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/tmp/html/.gitignore @@ -0,0 +1 @@ +* diff --git a/tmp/object/.gitignore b/tmp/object/.gitignore new file mode 100644 index 0000000..72e8ffc --- /dev/null +++ b/tmp/object/.gitignore @@ -0,0 +1 @@ +* diff --git a/tox.ini b/tox.ini deleted file mode 100644 index d330257..0000000 --- a/tox.ini +++ /dev/null @@ -1,8 +0,0 @@ -[flake8] -max-line-length = 119 - -[pep8] -# autopep8 will rewrite lines to be shorter, even though we raised the length -ignore = E501 - -; vim: et