diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 4200623..d1c43c3 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -57,6 +57,17 @@ If you are proposing a feature: Get Started! ------------ +Using docker +------------ + +1. make -f Makefile.dev dev-setup + 1. make -f Makefile.dev dev-shell +2. make -f Makefile.dev test +3. make -f Makefile.dev tox + +From Source Code +----------- + Ready to contribute? Here's how to set up `facho` for local development. 1. Fork the `facho` repo . @@ -94,13 +105,6 @@ Ready to contribute? Here's how to set up `facho` for local development. 7. Submit a pull request through the GitHub website. -Using docker ------------- - -1. make -f Makefile.dev build -2. make -f Makefile.dev dev-shell -3. make -f Makefile.dev python3.8 setup.py develop -4. make -f Makefile.dev python3.8 setup.py test Pull Request Guidelines ----------------------- diff --git a/Dockerfile b/Dockerfile index ee5d265..b7a3dcf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,6 @@ RUN apt-get install -y --no-install-recommends \ ca-certificates RUN wget https://bootstrap.pypa.io/get-pip.py \ - && python3 get-pip.py pip==21.3 \ && python3.7 get-pip.py pip==21.3 \ && python3.8 get-pip.py pip==21.3 \ && rm get-pip.py @@ -20,11 +19,9 @@ RUN apt-get install -y --no-install-recommends \ build-essential \ zip -RUN python3.6 --version RUN python3.7 --version RUN python3.8 --version -RUN pip3.6 install setuptools setuptools-rust RUN pip3.7 install setuptools setuptools-rust RUN pip3.8 install setuptools setuptools-rust diff --git a/tox.ini b/tox.ini index f7186a0..2fee393 100644 --- a/tox.ini +++ b/tox.ini @@ -1,17 +1,10 @@ [tox] -envlist = py27, py34, py35, py36, flake8 +envlist = py37, py38 [travis] python = - 3.6: py36 - 3.5: py35 - 3.4: py34 - 2.7: py27 - -[testenv:flake8] -basepython = python -deps = flake8 -commands = flake8 facho + 3.7: py37 + 3.8: py38 [testenv] setenv =