Merge pull request #29 from BeyondEvil/switch-to-pyproject

Switch to pyproject.toml

Author: BeyondEvil

.github/workflows/nightly.yml

@@ -0,0 +1,10 @@
+name: Nightly tests
+
+on:
+  schedule:
+    - cron: '1 0 * * *'  # Run daily at 0:01 UTC
+
+jobs:
+  tests:
+    if: github.repository_owner == 'pytest-dev'
+    uses: ./.github/workflows/test.yml

.github/workflows/publish.yml

@@ -0,0 +1,34 @@
+name: publish
+
+on:
+  push:
+    tags:
+      - v*
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: "3.9"
+    - name: Install poetry
+      run: curl -sSL https://install.python-poetry.org | python3 -
+    - name: Configure poetry
+      run: poetry config virtualenvs.in-project true
+    - name: Set up cache
+      uses: actions/cache@v3
+      with:
+        path: .venv
+        key: venv-${{ hashFiles('**/poetry.lock') }}
+        restore-keys: venv-
+    - name: Install Dependencies
+      run: poetry install
+    - name: Publish
+      run: >-
+        poetry publish
+        --build
+        --username __token__
+        --password ${{ secrets.PYPI_TOKEN }}

.github/workflows/test.yml

@@ -0,0 +1,47 @@
+name: test
+
+on:
+  push:
+    branches:
+      - master
+    tags-ignore:
+      - v*
+  pull_request:
+  workflow_call:
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python: ["3.7", "3.8", "3.9", "3.10", "pypy-3.8"]
+        os: [ubuntu-latest, windows-latest]
+        include:
+          - python: "3.7"
+            tox_env: "py37"
+          - python: "3.8"
+            tox_env: "py38"
+          - python: "3.9"
+            tox_env: "py39"
+          - python: "3.10"
+            tox_env: "py310"
+          - python: "pypy-3.8"
+            tox_env: "pypy3"
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Python
+      uses: actions/setup-python@v3
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install tox
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox
+    - name: Cache tox environments
+      uses: actions/cache@v3
+      with:
+        path: .tox
+        key: tox-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}
+    - name: Test
+      run: tox -e ${{ matrix.tox_env }}

.gitignore

@@ -2,9 +2,7 @@ __pycache__
 *.egg-info/
 *.pyc
 .cache
-.DS_Store
 .tox
 .eggs
-.vscode/
 build
 dist

.pre-commit-config.yaml

@@ -1,15 +1,20 @@
 repos:
-
--   repo: https://github.com/psf/black
-    rev: stable
+  - repo: https://github.com/psf/black
+    rev: 22.1.0
     hooks:
-    -   id: black
+      - id: black
         args: [--safe, --quiet]
         language_version: python3
 
--   repo: https://gitlab.com/pycqa/flake8
-    rev: 3.7.7
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+
+  - repo: https://gitlab.com/PyCQA/flake8
+    rev: 4.0.1
     hooks:
-    -   id: flake8
+      - id: flake8
         exclude: docs
         language_version: python3

.travis.yml

@@ -25,8 +25,7 @@ Requirements
 
 You will need the following prerequisites in order to use pytest-base-url:
 
-- Python 2.7, 3.6, PyPy, or PyPy3
-- py.test 2.7 or newer
+- Python 3.7+ or PyPy3
 
 Installation
 ------------

Pipfile

@@ -1,18 +1,18 @@
 Development
 ===========
 
-To contribute to `pytest-base-url` you can use `Pipenv`_ to manage
+To contribute to `pytest-base-url` you can use `Poetry <https://python-poetry.org/>`_ to manage
 a python virtual environment and `pre-commit <https://pre-commit.com/>`_ to help you with
 styling and formatting.
 
 To setup the virtual environment and pre-commit, run:
 
 .. code-block:: bash
 
-  $ pipenv install --dev
-  $ pipenv run pre-commit install
+  $ poetry install
+  $ poetry run pre-commit install
 
-If you're not using `Pipenv`_, to install `pre-commit`, run:
+If you're not using ``Poetry``, to install ``pre-commit``, run:
 
 .. code-block:: bash
 
@@ -23,30 +23,21 @@ If you're not using `Pipenv`_, to install `pre-commit`, run:
 Automated Testing
 -----------------
 
-All pull requests and merges are tested in `Travis CI <https://travis-ci.org/>`_
-based on the ``.travis.yml`` file.
-
-Usually, a link to your specific travis build appears in pull requests, but if
-not, you can find it on the
-`pull requests page <https://travis-ci.org/pytest-dev/pytest-base-url/pull_requests>`_
-
-The only way to trigger Travis CI to run again for a pull request, is to submit
-another change to the pull branch.
-
-You can do this with `git commit --allow-empty`
+All pull requests and merges are tested in `GitHub Actions <https://docs.github.com/en/actions>`_
+based on the workflows defined in ``.github/workflows``.
 
 Running Tests
 -------------
 
-You will need `Tox <http://tox.testrun.org/>`_ installed to run the tests
-against the supported Python versions. If you're using `Pipenv`_ it will be
+You will need `Tox <https://tox.wiki/en/latest/>`_ installed to run the tests
+against the supported Python versions. If you're using ``Poetry`` it will be
 installed for you.
 
-With `Pipenv`_, run:
+With ``Poetry``, run:
 
 .. code-block:: bash
 
-  $ pipenv run tox
+  $ poetry run tox
 
 Otherwise, to install and run, do:
 
@@ -60,11 +51,12 @@ Releasing a new version
 
 Follow these steps to release a new version of the project:
 
-1. Update your local master with the upstream master (``git pull --rebase upstream master``)
-2. Create a new branch and update ``CHANGES.rst`` with the new version, today's date, and all changes/new features
-3. Commit and push the new branch and then create a new pull request
-4. Wait for tests and reviews and then merge the branch
-5. Once merged, update your local master again (``git pull --rebase upstream master``)
-6. Tag the release with the new release version (``git tag v<new tag>``)
-7. Push the tag (``git push upstream --tags``)
-8. Done. You can monitor the progress on `Travis <https://travis-ci.org/pytest-dev/pytest-base-url/>`_
+#. Update your local master with the upstream master (``git pull --rebase upstream master``)
+#. Create a new branch and update ``CHANGES.rst`` with the new version, today's date, and all changes/new features
+#. Update ``pyproject.toml`` with the new version
+#. Commit and push the new branch and then create a new pull request
+#. Wait for tests and reviews and then merge the branch
+#. Once merged, update your local master again (``git pull --rebase upstream master``)
+#. Tag the release with the new release version (``git tag v<new tag>``)
+#. Push the tag (``git push upstream --tags``)
+#. Done.