diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1298a18e..bf228eff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: - name: Prepare tox run: | V=${{ matrix.python-version }} - echo TOX_PYTHON=py"$(echo $V | tr -d.)" >>"$GITHUB_ENV" + echo TOX_PYTHON=py"$(echo $V | tr -d '.')" >>"$GITHUB_ENV" - run: > uvx --with=tox-uv diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 686afab9..00000000 --- a/.travis.yml +++ /dev/null @@ -1,35 +0,0 @@ -sudo: required -dist: trusty -language: python -python: - - 2.6 -node_js: - - "4.3.2" -install: - - sudo apt-get -qq update - - # Supposed to help get PIL to install on PyPi - # https://github.com/python-imaging/Pillow/issues/570 - - sudo apt-get install python-tk - - # To install external filter binaries, we first need to install - # RubyGems and Node/NPM. I'm not sure why, since it seems clear - # that NVM and RVM are pre-installed (see below). - - sudo apt-get install python-software-properties - - # Now install the external filter binaries, finally. - # If we use sudo for this, ruby gems will not work: it seems they are - # then installed globally, but are then searched for in a RVM location. - # (Clearing GEM_HOME might be a way to fix this, if sudo where necessary). - - sh requirements-dev.sh - - # Install our test runner - - pip install tox - -script: tox -notifications: - email: - - michael@elsdoerfer.com -branches: - only: - - master diff --git a/README.rst b/README.rst index b75bebcc..2b3e1434 100644 --- a/README.rst +++ b/README.rst @@ -1,7 +1,7 @@ Asset management application for Python web development - use it to merge and compress your JavaScript and CSS files. -Documentation: |travis| +Documentation: |ci| https://webassets.readthedocs.io/ Since releases aren't exactly happening on a regular schedule, you are @@ -17,10 +17,10 @@ Development: For development, to run all the tests, you need to have at least Java 7 installed (required for example to run the `Google closure`_ filter). - 1. Install Python requirements (preferable in a virtual env):: + 1. Install Python requirements with uv:: - $ pip install -r requirements-dev.pip - $ pip install -r requirements-dev-2.x.pip + $ uv venv + $ uv pip install -r uv.lock 2. Install other requirements:: @@ -34,5 +34,5 @@ __ http://github.com/miracle2k/webassets/tarball/master#egg=webassets-dev .. _`Google closure`: https://github.com/google/closure-compiler/wiki/FAQ#the-compiler-crashes-with-unsupportedclassversionerror-or-unsupported-majorminor-version-510 -.. |travis| image:: https://secure.travis-ci.org/miracle2k/webassets.png?branch=master - :target: http://travis-ci.org/miracle2k/webassets +.. |ci| image:: https://github.com/miracle2k/webassets/actions/workflows/ci.yml/badge.svg + :target: https://github.com/miracle2k/webassets/actions/workflows/ci.yml \ No newline at end of file diff --git a/requirements-dev-2.x.pip b/requirements-dev-2.x.pip deleted file mode 100644 index 717cc525..00000000 --- a/requirements-dev-2.x.pip +++ /dev/null @@ -1,8 +0,0 @@ -# Some additional dependencies that are currently not yet available on Python 3. - -pillow<4 -clevercss -pyScss==1.1.5 -slimmer -cssmin -rjsmin>=1.0.12 diff --git a/tox.ini b/tox.ini index eeb5488e..cc7c2e48 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,6 @@ package = wheel wheel_build_env = .pkg description = run the tests with pytest extras = slimit, ply, sass, rcssmin, closure, jinja2, cssutils -uv_python_preference = managed deps = pytest commands =